Changeset 10658 in orxonox.OLD

Timestamp:

May 21, 2007, 1:48:08 AM (17 years ago)

Author:

bknecht

Message:

changes from landauf

Location:

trunk/src/world_entities/particles

Files:

• box_emitter.cc (modified) (1 diff)
• dot_emitter.cc (modified) (1 diff)
• particle_emitter.cc (modified) (3 diffs)
• particle_emitter.h (modified) (2 diffs)
• particle_system.cc (modified) (3 diffs)
• particle_system.h (modified) (1 diff)
• plane_emitter.cc (modified) (1 diff)

trunk/src/world_entities/particles/box_emitter.cc

@@ -112 +112 @@
     Quaternion moment = Quaternion(this->momentum + this->momentumRandom, randDir);
 
-    this->getSystem()->addParticle(box, velocityV, orient, moment);
+    this->getSystem()->addParticle(box, velocityV, orient, moment, extForce);
 
   }

trunk/src/world_entities/particles/dot_emitter.cc

@@ -88 +88 @@
 
     this->getSystem()->addParticle(this->getAbsCoor() + this->getVelocity()*.1*rand()/RAND_MAX,
-                                   velocityV, orient, moment);
+                                   velocityV, orient, moment, extForce);
 
   }

trunk/src/world_entities/particles/particle_emitter.cc

@@ -39 +39 @@
   this->setEmissionRate(emissionRate);
   this->setEmissionVelocity(velocity);
+  this->setExtForce(0, 0, 0);
 
   this->saveTime = 0.0;
@@ -69 +70 @@
   LoadParam(root, "emission-velocity", this, ParticleEmitter, setEmissionVelocity)
     .describe("How fast the particles are emittet (their initial speed)");
+
+  LoadParam(root, "ext-force", this, ParticleEmitter, setExtForce)
+      .describe("The external force that affects the particles.");
 
   LoadParam(root, "emission-momentum", this, ParticleEmitter, setEmissionMomentum)
@@ -166 +170 @@
   this->momentum = momentum;
   this->momentumRandom = randomMomentum;
+}
+
+/**
+ *  sets the external force that affects all particles emitted
+*/
+void ParticleEmitter::setExtForce(float x, float y, float z)
+{
+    this->extForce = Vector(x, y, z);
 }
 

trunk/src/world_entities/particles/particle_emitter.h

@@ -47 +47 @@
   void setEmissionVelocity(float velocity, float randomVelocity = 0.0);
   void setEmissionMomentum(float momentum, float randomMomentum = 0.0);
+  void setExtForce(float x, float y, float z);
 
   /** @returns the emissionRate */
@@ -73 +74 @@
   float           momentum;          //!< The Initial spped of the Rotation.
   float           momentumRandom;    //!< The random variation of the Momentum.
+  Vector          extForce;          //!< The external Force
 
 //private:

trunk/src/world_entities/particles/particle_system.cc

@@ -339 +339 @@
                      + randMassAnim.getValue(tickPart->lifeCycle) * tickPart->massRand;
 
-    tickPart->extForce = Vector(0,0,0);
+    //tickPart->extForce = Vector(0,0,0);
 
     // applying Color
@@ -422 +422 @@
  * @param data some more data given by the emitter
 */
-void ParticleSystem::addParticle(const Vector& position, const Vector& velocity, const Quaternion& orientation, const Quaternion& momentum, unsigned int data)
+void ParticleSystem::addParticle(const Vector& position, const Vector& velocity, const Quaternion& orientation, const Quaternion& momentum, const Vector& extForce, unsigned int data)
 {
   if (this->count <= this->maxCount)
@@ -462 +462 @@
     particles->position = position;
     particles->velocity = velocity;
+    particles->extForce = extForce;
 
     particles->orientation = orientation;

trunk/src/world_entities/particles/particle_system.h

@@ -102 +102 @@
   virtual void tickPhys(float dt) {};
 
-  void addParticle(const Vector& position, const Vector& velocity, const Quaternion& orientation, const Quaternion& momentum, unsigned int data = 0);
+  void addParticle(const Vector& position, const Vector& velocity, const Quaternion& orientation, const Quaternion& momentum, const Vector& extForce, unsigned int data = 0);
 
   void precache(unsigned int seconds, unsigned int ticksPerSecond = 25);

trunk/src/world_entities/particles/plane_emitter.cc

@@ -111 +111 @@
     Quaternion moment = Quaternion(this->momentum + this->momentumRandom, randDir);
 
-    this->getSystem()->addParticle(plane, velocityV, orient, moment);
+    this->getSystem()->addParticle(plane, velocityV, orient, moment, extForce);
 
   }