Changeset 10098 in orxonox.OLD for branches/playability/src/world_entities/particles

Timestamp:

Dec 19, 2006, 4:08:04 PM (18 years ago)

Author:

marcscha

Message:

addition of local travel speed, removal of path hacks

Location:

branches/playability/src/world_entities/particles

Files:

• emitter_node.cc (modified) (1 diff)
• emitter_node.h (modified) (3 diffs)

branches/playability/src/world_entities/particles/emitter_node.cc

@@ -73 +73 @@
 
   this->lifeCycle += dt/this->lifeSpan;
-  if  (unlikely(this->lifeCycle >= 1))
+  if  (this->lifeCycle >= 1)
   {
     this->removeNode();
+    this->hide();
+    this->system->removeEmitter(this->emitter);
+    this->emitter->stop();
+    this->emitter->setSystem(NULL);
+    this->started = false;
   }
   PRINTF(0)("Coordinate Update EmitterNode: (%f,%f,%f) -> (%f,%f,%f)\n",this->getAbsCoor().x,this->getAbsCoor().y,this->getAbsCoor().z,this->velocity.x,this->velocity.y,this->velocity.z);

branches/playability/src/world_entities/particles/emitter_node.h

@@ -8 +8 @@
 #define _EMITTER_NODE_H
 
-#include "p_node.h"
+#include "world_entity.h"
 #include "dot_emitter.h"
+#include "particle_system.h"
 
 // FORWARD DECLARATION
@@ -17 +18 @@
 
 //! A class to handle an Emitter.
-class EmitterNode : public PNode
+class EmitterNode : public WorldEntity
 {
   ObjectListDeclaration(EmitterNode);
@@ -31 +32 @@
   inline void setVelocity(Vector velocity) { this->velocity = velocity;};
 
-  inline void setupParticle(DotEmitter* emitter, ParticleSystem* system) { this->emitter = emitter; this->system = system;} ;
+  inline void setupParticle(DotEmitter* emitter, ParticleSystem* system) { this->emitter = emitter; this->system = system; this->system->setLifeSpan(this->lifeSpan);} ;
   void setLifetime( float lifeTime) { this->lifeSpan  = lifeTime;};