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

Timestamp:

Jun 11, 2005, 12:55:48 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: setClassID implemented in all files

File:

• orxonox/trunk/src/lib/particles/particle_emitter.cc (modified) (5 diffs)

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

@@ -1 @@
-/* 
+/*
    orxonox - the future of 3D-vertical-scrollers
 
@@ -31 +31 @@
    \brief standard constructor
 */
-ParticleEmitter::ParticleEmitter(const Vector& direction, float angle, float emissionRate, 
-                  float velocity)
-{
+ParticleEmitter::ParticleEmitter(const Vector& direction, float angle, float emissionRate,
+                  float velocity)
+{
+  this->setClassID(CL_PARTICLE_EMITTER, "ParticleEmitter");
   this->type = EMITTER_DOT;
   this->emitterSize = 1.0;
@@ -64 +65 @@
    removes the EmitterSystem from the ParticleEngine
 */
-ParticleEmitter::~ParticleEmitter () 
+ParticleEmitter::~ParticleEmitter ()
 {
   ParticleEngine::getInstance()->removeEmitter(this);
@@ -91 +92 @@
   LoadParam<ParticleEmitter>(root, "emission-velocity", this, &ParticleEmitter::setEmissionVelocity)
     .describe("How fast the particles are emittet (their initial speed)");
-  
+
   LoadParam<ParticleEmitter>(root, "spread", this, &ParticleEmitter::setSpread)
     .describe("The angle the particles are emitted from (angle, deviation)");
@@ -224 +225 @@
     float count = (dt+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); 
-    
+    PRINTF(5)("emitting %f particles, saving %f seconds for the next round\n", count, this->saveTime);
+
     if (likely(count > 0))
       {
-        Vector inheritVelocity = this->getVelocity() * this->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;
-
-            // this should spread the Particles evenly. if the Emitter is moved around quickly
-            Vector equalSpread = this->getVelocity() * rand()/RAND_MAX * dt;
-            Vector extension; // the Vector for different fields.
-
-            if (this->type & 2)
-              {
-                extension = Vector(this->emitterSize * ((float)rand()/RAND_MAX -.5), 0, this->emitterSize * ((float)rand()/RAND_MAX - .5));
-                extension = this->getAbsDir().apply(extension);
-              }
-            else if (this->type & 8)
-              {
-                extension = Vector((float)rand()/RAND_MAX -.5, (float)rand()/RAND_MAX -.5, (float)rand()/RAND_MAX -.5) * this->emitterSize;
-              }
-
-            system->addParticle(this->getAbsCoor() + extension - equalSpread, velocityV);
-            
-          }
+        Vector inheritVelocity = this->getVelocity() * this->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;
+
+            // this should spread the Particles evenly. if the Emitter is moved around quickly
+            Vector equalSpread = this->getVelocity() * rand()/RAND_MAX * dt;
+            Vector extension; // the Vector for different fields.
+
+            if (this->type & 2)
+              {
+                extension = Vector(this->emitterSize * ((float)rand()/RAND_MAX -.5), 0, this->emitterSize * ((float)rand()/RAND_MAX - .5));
+                extension = this->getAbsDir().apply(extension);
+              }
+            else if (this->type & 8)
+              {
+                extension = Vector((float)rand()/RAND_MAX -.5, (float)rand()/RAND_MAX -.5, (float)rand()/RAND_MAX -.5) * this->emitterSize;
+              }
+
+            system->addParticle(this->getAbsCoor() + extension - equalSpread, velocityV);
+
+          }
       }
   }