Changeset 3933 in orxonox.OLD for orxonox/branches

Timestamp:

Apr 23, 2005, 1:10:58 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/particleEngine: emitting 10000 particles a second …. without deleting anyone of them

Location:

orxonox/branches/particleEngine/src

Files:

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

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

@@ -32 +32 @@
    this->direction = direction;
    this->setSpread(angle);
-   this->emissionRate = emissionRate;
+   this->setEmissionRate(emissionRate);
    this->velocity = velocity;
 
@@ -67 +67 @@
    \brief set the emission rate
    \param sets the number of particles emitted per second
-   \param random A random emissionRate, the +- randomness of this option
 
    if you want to change the value of this variable during emission time (to make it more dynamic)
@@ -73 +72 @@
 */
 void ParticleEmitter::setEmissionRate(float emissionRate)
-{}
+{
+  this->emissionRate = emissionRate;
+}
 
 /**
@@ -111 +112 @@
 {
   // saving the time
-  float countF = (dt+this->saveTime) / emissionRate;
+  float countF = (dt+this->saveTime) * this->emissionRate;
   int count = (int)round(countF);
   this->saveTime = countF - (float)count;
 
+  printf( "%d::%f::emmit %f\n", count, countF, emissionRate);
+
   for (int i = 0; i <= count; i++)
     // emmits from EMITTER_DOT,
-    system->addParticle(this->getAbsCoor(), direction * velocity );
+    {
+      Vector randDir = Quaternion(Vector(random()-RAND_MAX/2, random()-RAND_MAX/2, random()-RAND_MAX/2), angle).apply(this->direction);
+      randDir.normalize();
+      system->addParticle(this->getAbsCoor(), randDir* velocity);
+    }
 }

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

@@ -377 +377 @@
             this->glmis->step();
             
-            testEmitter = new ParticleEmitter(Vector(1,0,0));
+            testEmitter = new ParticleEmitter(Vector(1,0,0), 20.0, 10000.0, .1);
+            testEmitter->setParent(localPlayer);
             testSystem = new ParticleSystem();