Changeset 9900 for code/branches/presentationHS13/src/orxonox/graphics

Timestamp:

Dec 16, 2013, 1:33:09 PM (12 years ago)

Author:

smerkli

Message:

Merged the invaders branch of Florian

Location:

code/branches/presentationHS13

Files:

• . (modified) (1 prop)
• src/orxonox/graphics/ParticleEmitter.cc (modified) (1 diff)
• src/orxonox/graphics/ParticleEmitter.h (modified) (1 diff)

code/branches/presentationHS13/src/orxonox/graphics/ParticleEmitter.cc

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

code/branches/presentationHS13/src/orxonox/graphics/ParticleEmitter.h

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