[Orxonox-commit 5205] r9869 - in code/branches/invaders/src/orxonox: graphics worldentities

[zifloria at orxonox.net]

Author: zifloria
Date: 2013-12-03 21:02:04 +0100 (Tue, 03 Dec 2013)
New Revision: 9869

Modified:
   code/branches/invaders/src/orxonox/graphics/ParticleEmitter.cc
   code/branches/invaders/src/orxonox/graphics/ParticleEmitter.h
   code/branches/invaders/src/orxonox/worldentities/BigExplosion.cc
Log:
tried to make particle effects dynamic. Didn't work....

Modified: code/branches/invaders/src/orxonox/graphics/ParticleEmitter.cc
===================================================================
--- code/branches/invaders/src/orxonox/graphics/ParticleEmitter.cc	2013-12-03 19:18:15 UTC (rev 9868)
+++ code/branches/invaders/src/orxonox/graphics/ParticleEmitter.cc	2013-12-03 20:02:04 UTC (rev 9869)
@@ -44,7 +44,7 @@
 {
     RegisterClass(ParticleEmitter);
 
-    ParticleEmitter::ParticleEmitter(Context* context) : StaticEntity(context)
+    ParticleEmitter::ParticleEmitter(Context* context) : MovableEntity(context)
     {
         RegisterObject(ParticleEmitter);
 

Modified: code/branches/invaders/src/orxonox/graphics/ParticleEmitter.h
===================================================================
--- code/branches/invaders/src/orxonox/graphics/ParticleEmitter.h	2013-12-03 19:18:15 UTC (rev 9868)
+++ code/branches/invaders/src/orxonox/graphics/ParticleEmitter.h	2013-12-03 20:02:04 UTC (rev 9869)
@@ -32,11 +32,11 @@
 #include "OrxonoxPrereqs.h"
 
 #include <string>
-#include "worldentities/StaticEntity.h"
+#include "worldentities/MovableEntity.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport ParticleEmitter : public StaticEntity
+    class _OrxonoxExport ParticleEmitter : public MovableEntity
     {
         public:
             ParticleEmitter(Context* context);

Modified: code/branches/invaders/src/orxonox/worldentities/BigExplosion.cc
===================================================================
--- code/branches/invaders/src/orxonox/worldentities/BigExplosion.cc	2013-12-03 19:18:15 UTC (rev 9868)
+++ code/branches/invaders/src/orxonox/worldentities/BigExplosion.cc	2013-12-03 20:02:04 UTC (rev 9869)
@@ -147,15 +147,19 @@
         this->debrisEntity3_->attach(debris3_);
         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");
         effect->setLifetime(4.0f);
         effect->setSyncMode(0);
 
         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");
         effect2->setLifetime(4.0f);