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

Timestamp:

Dec 19, 2006, 10:03:19 PM (18 years ago)

Author:

marcscha

Message:

many additions, several fixes

Location:

branches/playability/src/world_entities/particles

Files:

• emitter_node.cc (modified) (4 diffs)
• emitter_node.h (modified) (2 diffs)

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

@@ -21 +21 @@
 
 #include "util/loading/load_param.h"
+#include "util/loading/factory.h"
 #include "debug.h"
 
 ObjectListDefinition(EmitterNode);
+//CREATE_FAST_FACTORY(EmitterNode);
 
 /**
@@ -32 +34 @@
   this->registerObject(this, EmitterNode::_objectList);
 
+  this->toList(OM_DEAD_TICK);
+
   this->system = NULL;
   this->emitter = NULL;
   this->lifeCycle = 0.0;
   this->lifeSpan = lifetime;
+
+  this->setParent( PNode::getNullParent());
 }
 
@@ -64 +70 @@
 {
   this->started  = true;
+
+  this->emitter->start();
+  this->emitter->setSystem( this->system);
+
   return this->started;
 }
@@ -69 +79 @@
 void EmitterNode::tick(float dt)
 {
+
   if( !this->started)
     return;
 
   this->lifeCycle += dt/this->lifeSpan;
-  if  (this->lifeCycle >= 1)
+
+  if( this->lifeCycle >= 1.0f)
   {
     this->removeNode();
-    this->hide();
-    this->system->removeEmitter(this->emitter);
     this->emitter->stop();
     this->emitter->setSystem(NULL);
     this->started = false;
+
+    this->destroy( NULL );
   }
-  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);
-  this->setAbsCoor(this->getAbsCoor() + (this->velocity * dt));
+  this->shiftCoor(this->velocity * dt);
 }

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

@@ -1 +1 @@
 /*!
- * @file particle_emitter.h
+ * @file emitter_node.h
   *  Definition of a EmitterNode
   *  An emitter node is a node that takes an emitter and a particle system and keeps them alive for a given amount of time.
@@ -32 +32 @@
   inline void setVelocity(Vector velocity) { this->velocity = velocity;};
 
-  inline void setupParticle(DotEmitter* emitter, ParticleSystem* system) { this->emitter = emitter; this->system = system; this->system->setLifeSpan(this->lifeSpan);} ;
+  inline void setupParticle(DotEmitter* emitter, ParticleSystem* system) { this->emitter = emitter; this->emitter->setParent( this); this->system = system;} ;
   void setLifetime( float lifeTime) { this->lifeSpan  = lifeTime;};