Changeset 10658 in orxonox.OLD for trunk/src/world_entities/particles/particle_system.cc

Timestamp:

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

Author:

bknecht

Message:

changes from landauf

File:

• trunk/src/world_entities/particles/particle_system.cc (modified) (3 diffs)

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;