Changeset 9950

Timestamp:

Jan 3, 2014, 3:25:44 PM (11 years ago)

Author:

landauf

Message:

ParticleEmitter should be a StaticEntity just like every other graphics class. If it needs to move, attach it to a movable entity.

Location:

code/trunk/src/orxonox

Files:

• graphics/ParticleEmitter.cc (modified) (1 diff)
• graphics/ParticleEmitter.h (modified) (1 diff)
• worldentities/pawns/Pawn.cc (modified) (3 diffs)

code/trunk/src/orxonox/graphics/ParticleEmitter.cc

@@ -45 +45 @@
     RegisterClass(ParticleEmitter);
 
-    ParticleEmitter::ParticleEmitter(Context* context) : MovableEntity(context)
+    ParticleEmitter::ParticleEmitter(Context* context) : StaticEntity(context)
     {
         RegisterObject(ParticleEmitter);

code/trunk/src/orxonox/graphics/ParticleEmitter.h

@@ -33 +33 @@
 
 #include <string>
-#include "worldentities/MovableEntity.h"
+#include "worldentities/StaticEntity.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport ParticleEmitter : public MovableEntity
+    class _OrxonoxExport ParticleEmitter : public StaticEntity
     {
         public:

code/trunk/src/orxonox/worldentities/pawns/Pawn.cc

@@ -392 +392 @@
             effect->setPosition(this->getPosition());
             effect->setOrientation(this->getOrientation());
-            effect->setVelocity(this->getVelocity());
             effect->setDestroyAfterLife(true);
             effect->setSource("Orxonox/explosion2b");
@@ -401 +400 @@
             effect->setPosition(this->getPosition());
             effect->setOrientation(this->getOrientation());
-            effect->setVelocity(this->getVelocity());
             effect->setDestroyAfterLife(true);
             effect->setSource("Orxonox/smoke6");
@@ -410 +408 @@
             effect->setPosition(this->getPosition());
             effect->setOrientation(this->getOrientation());
-            effect->setVelocity(this->getVelocity());
             effect->setDestroyAfterLife(true);
             effect->setSource("Orxonox/sparks");