Changeset 9952 for code/trunk/src

Timestamp:

Jan 3, 2014, 3:41:45 PM (11 years ago)

Author:

landauf

Message:

neither ParticleSpawner nor the explosion_ object need to be MovableEntities since they are all attached to BigExplosion which is itself movable.
if you want the explosion particles to move in local space (i.e. if you want to avoid the smoke- and fire-tail of a moving explosion) use a different particle-effect which has the "local_space" property set to "true".

Location:

code/trunk/src/orxonox/worldentities

Files:

• BigExplosion.cc (modified) (3 diffs)
• BigExplosion.h (modified) (1 diff)

code/trunk/src/orxonox/worldentities/BigExplosion.cc

@@ -100 +100 @@
         this->debris4_->setSyncMode(0);
 
-        this->explosion_ = new MobileEntity(this->getContext());
+        this->explosion_ = new StaticEntity(this->getContext());
         this->explosion_->setSyncMode(0);
 
@@ -148 +148 @@
         this->debrisEntity4_->attach(debris4_);
 
-        // ///////////////////////
-        // TODO: particleSpawner is a static entity. It should probably be dynamic, for better explosions.
-        //
         ParticleSpawner* effect = new ParticleSpawner(this->getContext());
-        // effect->setVelocity(this->getVelocity());
         effect->setDestroyAfterLife(true);
         effect->setSource("Orxonox/explosion2b");
@@ -159 +155 @@
 
         ParticleSpawner* effect2 = new ParticleSpawner(this->getContext());
-        // effect2->setVelocity(Vector3(rnd(-1, 1), rnd(-1, 1), rnd(-1, 1))*rnd(10, 200));
         effect2->setDestroyAfterLife(true);
         effect2->setSource("Orxonox/smoke6");

code/trunk/src/orxonox/worldentities/BigExplosion.h

@@ -60 +60 @@
             bool                  bStop_;
 
-            MobileEntity*         explosion_;
+            StaticEntity*         explosion_;
 
             MovableEntity*        debrisEntity1_;