Changeset 1608 for code/trunk/src/orxonox/objects/ParticleSpawner.cc

Timestamp:

Jun 17, 2008, 3:33:03 PM (16 years ago)

Author:

landauf

Message:

• added a backlight to all SpaceShips, leaving a trail behind (configurable)
• changed some lines in SpaceShipAI, AI seems to be more fair now…
• fixed a bug in Math.cc algorithms to calculate radar positions and AI movement (division by zero and acos of 1.000001)
• added destroy() and destroydelay to ParticleSpawner, so the smoketrail of a destroyed enemy stays visible for some seconds
• added 2 lines to Orxonox.cc to make the length of the backlight-trail independend of the gamespeed

########################
# !!! MEDIA UPDATE !!! #
########################

File:

• code/trunk/src/orxonox/objects/ParticleSpawner.cc (modified) (3 diffs)

code/trunk/src/orxonox/objects/ParticleSpawner.cc

@@ -33 +33 @@
 #include "core/Executor.h"
 #include "tools/ParticleInterface.h"
+#include "GraphicsEngine.h"
 
 namespace orxonox
@@ -44 +45 @@
     }
 
-    ParticleSpawner::ParticleSpawner(const std::string& templateName, LODParticle::LOD detaillevel, float lifetime, float delay, const Vector3& direction)
+    ParticleSpawner::ParticleSpawner(const std::string& templateName, LODParticle::LOD detaillevel, float lifetime, float startdelay, float destroydelay, const Vector3& direction)
     {
         RegisterObject(ParticleSpawner);
-        this->setParticle(templateName, detaillevel, lifetime, delay, direction);
+        this->setParticle(templateName, detaillevel, lifetime, startdelay, destroydelay, direction);
     }
 
-    void ParticleSpawner::setParticle(const std::string& templateName, LODParticle::LOD detaillevel, float lifetime, float delay, const Vector3& direction)
+    void ParticleSpawner::setParticle(const std::string& templateName, LODParticle::LOD detaillevel, float lifetime, float startdelay, float destroydelay, const Vector3& direction)
     {
         ExecutorMember<ParticleSpawner>* executor = createExecutor(createFunctor(&ParticleSpawner::createParticleSpawner));
+        this->destroydelay_ = destroydelay;
         executor->setDefaultValues(lifetime);
-        this->timer_.setTimer(delay, false, this, executor);
+        this->timer_.setTimer(startdelay, false, this, executor);
         this->particle_ = new ParticleInterface(templateName, detaillevel);
         this->particle_->addToSceneNode(this->getNode());
@@ -72 +74 @@
         }
     };
+
+    void ParticleSpawner::destroy()
+    {
+        this->setPosition(this->getNode()->getParent()->getPosition());
+        this->getNode()->getParent()->removeChild(this->getNode());
+        GraphicsEngine::getSingleton().getSceneManager()->getRootSceneNode()->addChild(this->getNode());
+        if (this->particle_)
+            this->particle_->setEnabled(false);
+        if (!this->timer_.isActive() || this->timer_.getRemainingTime() > this->destroydelay_)
+            this->timer_.setTimer(this->destroydelay_, false, this, createExecutor(createFunctor(&ParticleSpawner::destroyParticleSpawner)));
+    }
 
     void ParticleSpawner::createParticleSpawner(float lifetime)