Changeset 4129 in orxonox.OLD

Timestamp:

May 9, 2005, 4:41:53 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/particleEngine: particles should get spread evenly if Emitter moves

Location:

orxonox/branches/particleEngine/src

Files:

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

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

@@ -137 +137 @@
             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);
+
+            // this should spread the Particles evenly. if the Emitter is moved around quickly
+            Vector equalSpread = this->getVelocity() * random()/RAND_MAX * dt;
+            equalSpread.debug();
+
+            system->addParticle(this->getAbsCoor() - equalSpread, velocityV);
           }
       }

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

@@ -228 +228 @@
 void ParticleEngine::tick(float dt)
 {
-  // add new Particles to each System connected to an Emitter.
-  tIterator<ParticleConnection>* tmpConIt = connectionList->getIterator();
-  ParticleConnection* tmpConnection = tmpConIt->nextElement();
-  while(tmpConnection)
-    {
-      tmpConnection->emitter->tick(dt, tmpConnection->system);
-      tmpConnection = tmpConIt->nextElement();
-    }
-  delete tmpConIt;
-  
-
   // ticks all the ParticleSystems
   tIterator<ParticleSystem>* tmpIt = systemList->getIterator();
@@ -248 +237 @@
     }
   delete tmpIt;
+
+  // add new Particles to each System connected to an Emitter.
+  tIterator<ParticleConnection>* tmpConIt = connectionList->getIterator();
+  ParticleConnection* tmpConnection = tmpConIt->nextElement();
+  while(tmpConnection)
+    {
+      tmpConnection->emitter->tick(dt, tmpConnection->system);
+      tmpConnection = tmpConIt->nextElement();
+    }
+  delete tmpConIt;
 }
 

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

@@ -291 +291 @@
             }
           else
-            this->particles = new Particle;
+            {
+              PRINTF(5)("Generating new Particle\n");
+              this->particles = new Particle;
+            }
           this->particles->next = NULL;
         }
@@ -304 +307 @@
             }
           else
-            tmpPart = new Particle;
+            {
+              PRINTF(5)("Generating new Particle\n");
+              tmpPart = new Particle;
+            }
           tmpPart->next = this->particles;
           this->particles = tmpPart;

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

@@ -496 +496 @@
   system->setLifeSpan(1);
   system->setRadius(2, 0, 2, 0);
-  ParticleEmitter* emitter = new ParticleEmitter(Vector(-1, 0, 0), 0, 500);
+  ParticleEmitter* emitter = new ParticleEmitter(Vector(-1, 0, 0), 0, 1000, 0);
   emitter->setParent(this->localPlayer);