Changeset 4017 in orxonox.OLD for orxonox/trunk/src/lib/graphics/particles/particle_emitter.cc

Timestamp:

May 2, 2005, 10:49:05 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged particleSystem back into the Trunk
merged with command:
svn merge particleEngine/ ../trunk/ -r 3966:HEAD
U ../trunk/src/lib/graphics/particles/particle_emitter.cc
U ../trunk/src/lib/graphics/particles/particle_system.cc
U ../trunk/src/lib/graphics/particles/particle_system.h

as you can see, no conflicts

File:

• orxonox/trunk/src/lib/graphics/particles/particle_emitter.cc (modified) (1 diff)

orxonox/trunk/src/lib/graphics/particles/particle_emitter.cc

@@ -124 +124 @@
     // saving the time
     float count = (dt+this->saveTime) * this->emissionRate;
-    this->saveTime = modff(count, &count);
-    this->saveTime /= this->emissionRate;
+    this->saveTime = modff(count, &count) / 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,
+    if (likely(count > 0))
       {
-        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()*velocity + (this->getVelocity() * system->inheritSpeed);
-
-        system->addParticle(this->getAbsCoor(), randDir);
+        Vector inheritVelocity = this->getVelocity() * system->inheritSpeed;
+        for (int i = 0; i < count; i++)
+          // emmits from EMITTER_DOT,
+          {
+            Vector randDir = Vector(rand()-RAND_MAX/2, rand()-RAND_MAX/2, rand()-RAND_MAX/2);
+            randDir.normalize();
+            randDir = (this->getAbsDir()*Quaternion(angle + randomAngle *((float)rand()/RAND_MAX -.5), randDir)).apply(this->direction);
+            Vector velocityV = randDir.getNormalized()*this->velocity + inheritVelocity;
+            
+            system->addParticle(this->getAbsCoor(), velocityV);
+          }
       }
   }