Changeset 9869 for code/branches/invaders

Timestamp:

Dec 3, 2013, 9:02:04 PM (11 years ago)

Author:

zifloria

Message:

tried to make particle effects dynamic. Didn't work….

Location:

code/branches/invaders/src/orxonox

Files:

• graphics/ParticleEmitter.cc (modified) (1 diff)
• graphics/ParticleEmitter.h (modified) (1 diff)
• worldentities/BigExplosion.cc (modified) (2 diffs)

code/branches/invaders/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/invaders/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:

code/branches/invaders/src/orxonox/worldentities/BigExplosion.cc

@@ -148 +148 @@
         this->debrisEntity4_->attach(debris4_);
 
-        // particleSpawner is a static entity. It should probably be dynamic, for better explosions.
-        // effect->SetVelocity(this->getVelocity() + Vector3(rnd(-1, 1), rnd(-1, 1), rnd(-1, 1))*rnd(10,100))
+        // ///////////////////////
+        // TODO: particleSpawner is a static entity. It should probably be dynamic, for better explosions.
+        //
         ParticleSpawner* effect = new ParticleSpawner(this->getContext());
+        // orxout() << "vel " << getVelocity() << endl;
+        // effect->setVelocity(Vector3(rnd(-1, 1), rnd(-1, 1), rnd(-1, 1))*rnd(10, 200));
         effect->setDestroyAfterLife(true);
         effect->setSource("Orxonox/explosion2b");
@@ -157 +160 @@
 
         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");