[Orxonox-commit 6903] r11524 - code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns
remartin at orxonox.net
remartin at orxonox.net
Mon Oct 30 16:22:22 CET 2017
Author: remartin
Date: 2017-10-30 16:22:22 +0100 (Mon, 30 Oct 2017)
New Revision: 11524
Modified:
code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/AsteroidMinable.cc
Log:
Modified: code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/AsteroidMinable.cc
===================================================================
--- code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/AsteroidMinable.cc 2017-10-30 15:18:57 UTC (rev 11523)
+++ code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns/AsteroidMinable.cc 2017-10-30 15:22:22 UTC (rev 11524)
@@ -79,6 +79,7 @@
this->setRadarObjectColour(ColourValue(1.0f, 1.0f, 0.0f, 1.0f));
this->setRadarObjectShape(RadarViewable::Shape::Dot);
+ this->generateSmaller = true;
this->size = 5;
this->context = context;
@@ -147,11 +148,12 @@
+ if(this->generateSmaller){
+ this->spawnChildren();
+ }
- this->spawnChildren();
-
if (this->getGametype() && this->getGametype()->allowPawnDeath(this, this->lastHitOriginator_))
{
// Set bAlive_ to false and wait for destroyLater() to do the destruction
@@ -185,6 +187,7 @@
//OFFEN:Kollision der Kinder verhindern
//Relativ zu Elternteil automatisch?
//Typ position:rand()*Vektoriwas?
+ // pawn->getWorldPosition() + Vector3(30,0,-30);
child->setPosition(this->getCarrierPosition());
}
}
More information about the Orxonox-commit
mailing list