Changeset 3950 in orxonox.OLD

Timestamp:

Apr 24, 2005, 11:32:48 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/particleEngine: timing is ok now when emitting small numbers/sec

Location:

orxonox/branches/particleEngine/src

Files:

• lib/graphics/particles/particle_emitter.cc (modified) (1 diff)
• lib/graphics/particles/particle_emitter.h (modified) (1 diff)
• story_entities/world.cc (modified) (2 diffs)

orxonox/branches/particleEngine/src/lib/graphics/particles/particle_emitter.cc

@@ -120 +120 @@
 void ParticleEmitter::tick(float dt, ParticleSystem* system)
 {
-  // saving the time
-  float count = (dt+this->saveTime) * this->emissionRate;
-  this->saveTime = modff(count, &count);
-  this->saveTime /= this->emissionRate;
-
-
-  for (int i = 0; i <= count; i++)
-    // emmits from EMITTER_DOT,
-    {
-      Vector randDir = Vector(random()-RAND_MAX/2, random()-RAND_MAX/2, random()-RAND_MAX/2);
-      randDir.normalize();
-      randDir = (this->getAbsDir()*Quaternion(angle + randomAngle *((float)random()/RAND_MAX -.5), randDir)).apply(this->direction);
-      randDir = *randDir.getNormalized() + (this->getVelocity() * system->inheritSpeed);
-
-      system->addParticle(this->getAbsCoor(), randDir* velocity);
-    }
+  if (likely(dt > 0.0 && this->emissionRate > 0.0))
+  {
+    // saving the time
+    float count = (dt+this->saveTime) * this->emissionRate;
+    this->saveTime = modff(count, &count);
+    this->saveTime /= this->emissionRate;
+    PRINTF(5)("emitting %f particles, saving %f seconds for the next round\n", count, this->saveTime); 
+    
+    for (int i = 0; i < count; i++)
+      // emmits from EMITTER_DOT,
+      {
+        Vector randDir = Vector(random()-RAND_MAX/2, random()-RAND_MAX/2, random()-RAND_MAX/2);
+        randDir.normalize();
+        randDir = (this->getAbsDir()*Quaternion(angle + randomAngle *((float)random()/RAND_MAX -.5), randDir)).apply(this->direction);
+        randDir = *randDir.getNormalized() + (this->getVelocity() * system->inheritSpeed);
+        
+        system->addParticle(this->getAbsCoor(), randDir* velocity);
+      }
+  }
 }
 

orxonox/branches/particleEngine/src/lib/graphics/particles/particle_emitter.h

@@ -22 +22 @@
 
  public:
-  ParticleEmitter(const Vector& direction, float angle = .5, float emissionRate = 1.0, 
+  ParticleEmitter(const Vector& direction, float angle = .5, float emissionRate = 1.0,
                   float velocity = 1.0);
   virtual ~ParticleEmitter(void);

orxonox/branches/particleEngine/src/story_entities/world.cc

@@ -380 +380 @@
             ParticleEmitter* testEmitter,* testEmitter2;
             ParticleSystem* testSystem;
-            testEmitter = new ParticleEmitter(Vector(-1,0,0), .4, 120.0, .5);
+            testEmitter = new ParticleEmitter(Vector(-1,0,0), .4, 60.0, 0);
             testEmitter->setParent(localPlayer);
             testEmitter->setRelCoor(Vector(-3, 0, 0));
@@ -390 +390 @@
             */
             testSystem = new ParticleSystem(10000);
-            testSystem->setLifeSpan(.3, .2);
+            testSystem->setLifeSpan(1, .2);
             testSystem->setRadius(3.0, 0.0, .5);
             testSystem->setConserve(.8);