[Orxonox-commit 5287] r9950 - in code/trunk/src/orxonox: graphics worldentities/pawns

[landauf at orxonox.net]

Author: landauf
Date: 2014-01-03 15:25:44 +0100 (Fri, 03 Jan 2014)
New Revision: 9950

Modified:
   code/trunk/src/orxonox/graphics/ParticleEmitter.cc
   code/trunk/src/orxonox/graphics/ParticleEmitter.h
   code/trunk/src/orxonox/worldentities/pawns/Pawn.cc
Log:
ParticleEmitter should be a StaticEntity just like every other graphics class. If it needs to move, attach it to a movable entity.

Modified: code/trunk/src/orxonox/graphics/ParticleEmitter.cc
===================================================================
--- code/trunk/src/orxonox/graphics/ParticleEmitter.cc	2014-01-03 14:14:19 UTC (rev 9949)
+++ code/trunk/src/orxonox/graphics/ParticleEmitter.cc	2014-01-03 14:25:44 UTC (rev 9950)
@@ -44,7 +44,7 @@
 {
     RegisterClass(ParticleEmitter);
 
-    ParticleEmitter::ParticleEmitter(Context* context) : MovableEntity(context)
+    ParticleEmitter::ParticleEmitter(Context* context) : StaticEntity(context)
     {
         RegisterObject(ParticleEmitter);
 

Modified: code/trunk/src/orxonox/graphics/ParticleEmitter.h
===================================================================
--- code/trunk/src/orxonox/graphics/ParticleEmitter.h	2014-01-03 14:14:19 UTC (rev 9949)
+++ code/trunk/src/orxonox/graphics/ParticleEmitter.h	2014-01-03 14:25:44 UTC (rev 9950)
@@ -32,11 +32,11 @@
 #include "OrxonoxPrereqs.h"
 
 #include <string>
-#include "worldentities/MovableEntity.h"
+#include "worldentities/StaticEntity.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport ParticleEmitter : public MovableEntity
+    class _OrxonoxExport ParticleEmitter : public StaticEntity
     {
         public:
             ParticleEmitter(Context* context);

Modified: code/trunk/src/orxonox/worldentities/pawns/Pawn.cc
===================================================================
--- code/trunk/src/orxonox/worldentities/pawns/Pawn.cc	2014-01-03 14:14:19 UTC (rev 9949)
+++ code/trunk/src/orxonox/worldentities/pawns/Pawn.cc	2014-01-03 14:25:44 UTC (rev 9950)
@@ -391,7 +391,6 @@
             ParticleSpawner* effect = new ParticleSpawner(this->getContext());
             effect->setPosition(this->getPosition());
             effect->setOrientation(this->getOrientation());
-            effect->setVelocity(this->getVelocity());
             effect->setDestroyAfterLife(true);
             effect->setSource("Orxonox/explosion2b");
             effect->setLifetime(4.0f);
@@ -400,7 +399,6 @@
             ParticleSpawner* effect = new ParticleSpawner(this->getContext());
             effect->setPosition(this->getPosition());
             effect->setOrientation(this->getOrientation());
-            effect->setVelocity(this->getVelocity());
             effect->setDestroyAfterLife(true);
             effect->setSource("Orxonox/smoke6");
             effect->setLifetime(4.0f);
@@ -409,7 +407,6 @@
             ParticleSpawner* effect = new ParticleSpawner(this->getContext());
             effect->setPosition(this->getPosition());
             effect->setOrientation(this->getOrientation());
-            effect->setVelocity(this->getVelocity());
             effect->setDestroyAfterLife(true);
             effect->setSource("Orxonox/sparks");
             effect->setLifetime(4.0f);