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

Timestamp:

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

Author:

marcscha

Message:

many additions, several fixes

File:

• branches/playability/src/world_entities/particles/emitter_node.h (modified) (2 diffs)

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;};