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

Timestamp:

May 27, 2005, 9:16:53 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/physics back to the trunk
merged with command
svn merge -r 3866:HEAD . ../../trunk/
many conflict that i tried to resolv
@patrick: i hope i did not interfere with your stuff :/

File:

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

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

@@ -31 +31 @@
 {
    this->setClassID(CL_PARTICLE_EMITTER, "ParticleEmitter");
+
+   this->type = EMITTER_DOT;
+   this->emitterSize = 1.0;
    this->direction = direction;
    this->setSpread(angle);
    this->setEmissionRate(emissionRate);
-   this->setVelocity(velocity);
+   this->setEmissionVelocity(velocity);
 
    this->saveTime = 0.0;
@@ -50 +53 @@
 {
   ParticleEngine::getInstance()->removeEmitter(this);
-  
 }
 
@@ -71 +73 @@
 
 /**
+   \param type the new Type of this emitter
+*/
+void ParticleEmitter::setType(EMITTER_TYPE type)
+{
+  this->type = type;
+}
+
+void ParticleEmitter::setSize(float emitterSize)
+{
+  if (emitterSize > 0.0)
+    this->emitterSize = emitterSize;
+  else
+    emitterSize = 0.0;
+}
+
+/**
    \brief set the emission rate
    \param sets the number of particles emitted per second
@@ -79 +97 @@
 void ParticleEmitter::setEmissionRate(float emissionRate)
 {
-  this->emissionRate = emissionRate;
+  if (emissionRate > 0.0)
+    this->emissionRate = emissionRate;
+  else
+    this->emissionRate = 0.0;
 }
 
@@ -104 +125 @@
    you may want to use the animation class
 */
-void ParticleEmitter::setVelocity(float velocity, float randomVelocity)
+void ParticleEmitter::setEmissionVelocity(float velocity, float randomVelocity)
 {
   this->velocity = velocity;
@@ -139 +160 @@
 
             // this should spread the Particles evenly. if the Emitter is moved around quickly
-            Vector equalSpread = this->getVelocity() * random()/RAND_MAX * dt;
+            Vector equalSpread = this->getVelocity() * rand()/RAND_MAX * dt;
+            Vector extension; // the Vector for different fields.
 
-            system->addParticle(this->getAbsCoor() - equalSpread, velocityV);
+            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);
+            
           }
       }