Changeset 3935 in orxonox.OLD for orxonox/branches/particleEngine/src/lib/graphics/particles/particle_emitter.cc

Timestamp:

Apr 23, 2005, 3:30:45 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/particleEngine: spread works, and many other functions implemented

File:

• orxonox/branches/particleEngine/src/lib/graphics/particles/particle_emitter.cc (modified) (6 diffs)

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

@@ -19 +19 @@
 
 #include "particle_system.h"
+#include "particle_engine.h"
 
 using namespace std;
@@ -33 +34 @@
    this->setSpread(angle);
    this->setEmissionRate(emissionRate);
-   this->velocity = velocity;
+   this->setVelocity(velocity);
 
    this->saveTime = 0.0;
+
+   ParticleEngine::getInstance()->addEmitter(this);
 }
 
@@ -45 +48 @@
 */
 ParticleEmitter::~ParticleEmitter () 
-{}
+{
+   ParticleEngine::getInstance()->removeEmitter(this);
+  
+}
 
 
@@ -85 +91 @@
 */
 void ParticleEmitter::setSpread(float angle, float randomAngle)
-{}
-
-
-
+{
+  this->angle = angle;
+  this->randomAngle = randomAngle;
+}
 
 /**
@@ -98 +104 @@
    you may want to use the animation class
 */
-void ParticleEmitter::setVelocity(float velocity, float random)
-{}
+void ParticleEmitter::setVelocity(float velocity, float randomVelocity)
+{
+  this->velocity = velocity;
+  this->randomVelocity = randomVelocity;
+}
 
 /**
@@ -116 +125 @@
   this->saveTime /= this->emissionRate;
 
+
   for (int i = 0; i <= count; i++)
     // emmits from EMITTER_DOT,
     {
-      Vector randDir = Quaternion(Vector(random()-RAND_MAX/2, random()-RAND_MAX/2, random()-RAND_MAX/2), angle).apply(this->direction);
+      Vector randDir = Vector(random()-RAND_MAX/2, random()-RAND_MAX/2, random()-RAND_MAX/2);
+      randDir.normalize();
+      randDir = Quaternion(angle + randomAngle *((float)random()/RAND_MAX -.5), randDir).apply(this->direction);
       randDir.normalize();
       system->addParticle(this->getAbsCoor(), randDir* velocity);