Changeset 6620 in orxonox.OLD for trunk/src

Timestamp:

Jan 19, 2006, 6:31:39 PM (19 years ago)

Author:

bensch

Message:

trunk: particle-optimisation

Location:

trunk/src/lib/particles

Files:

• particle_emitter.cc (modified) (2 diffs)
• particle_emitter.h (modified) (1 diff)
• particle_system.cc (modified) (1 diff)

trunk/src/lib/particles/particle_emitter.cc

@@ -268 +268 @@
    you may want to use the animation class
 */
-void ParticleEmitter::tick(float dt, ParticleSystem* system)
-{
+void ParticleEmitter::tick(float dt)
+{
+  assert (this->system != NULL);
   if (likely(dt > 0.0 && this->emissionRate > 0.0))
   {
@@ -308 +309 @@
         Quaternion moment = Quaternion(this->momentum + this->momentumRandom, randDir);
 
-        system->addParticle(this->getAbsCoor() + extension - equalSpread, velocityV, orient, moment);
+        this->system->addParticle(this->getAbsCoor() + extension - equalSpread, velocityV, orient, moment);
       }
     }

trunk/src/lib/particles/particle_emitter.h

@@ -45 +45 @@
   void start();
   void stop();
-  void tick(float dt, ParticleSystem* system);
+  void tick(float dt);
 
   void setSystem(ParticleSystem* system);

trunk/src/lib/particles/particle_system.cc

@@ -382 +382 @@
     std::list<ParticleEmitter*>::iterator emitter;
     for (emitter = this->emitters.begin(); emitter != this->emitters.end(); emitter++)
-      (*emitter)->tick(dt, this);
+      (*emitter)->tick(dt);
 }