Changeset 4182 in orxonox.OLD for orxonox/branches/physics/src/lib

Timestamp:

May 14, 2005, 1:15:25 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: connection of Physical effects should work on ParticleSystems

Location:

orxonox/branches/physics/src/lib/graphics/particles

Files:

• particle_system.cc (modified) (4 diffs)
• particle_system.h (modified) (3 diffs)

orxonox/branches/physics/src/lib/graphics/particles/particle_system.cc

@@ -23 +23 @@
 #include "material.h"
 
+#include "field.h"
+
 using namespace std;
 
@@ -34 +36 @@
 ParticleSystem::ParticleSystem (unsigned int maxCount, PARTICLE_TYPE type)
 {
-   this->setClassName ("ParticleSystem");
-   this->material = NULL;
-   this->name = NULL;
-   this->maxCount = maxCount;
-   this->count = 0;
-   this->particles = NULL;
-   this->deadList = NULL;
-   this->setConserve(1);
-   this->setLifeSpan(1);
-   this->setInheritSpeed(0);
-   this->glID = NULL;
-   this->setRadius(1.0, 1.0, 0.0);
-   this->setType(type, 1);
-   ParticleEngine::getInstance()->addSystem(this);
+  this->setClassName ("ParticleSystem");
+  this->material = NULL;
+  this->name = NULL;
+  this->maxCount = maxCount;
+  this->count = 0;
+  this->particles = NULL;
+  this->deadList = NULL;
+  this->setConserve(1);
+  this->setLifeSpan(1);
+  this->setInheritSpeed(0);
+  this->glID = NULL;
+  this->setRadius(1.0, 1.0, 0.0);
+  this->setType(type, 1);
+  ParticleEngine::getInstance()->addSystem(this);
 }
 
@@ -207 +209 @@
       tickPart->radius += tickPart->radiusIt * dt;
 
+      // applying force to the System.
+      tickPart->velocity += tickPart->extForce * tickPart->mass;
+      tickPart->extForce = Vector(0,0,0);
+
       // many more to come
-
 
       if (this->conserve < 1.0)
@@ -240 +245 @@
     }
 }
+
+/** 
+    \brief applies some force to a Particle.
+ */
+void ParticleSystem::applyField(Field* field)
+{
+  Particle* tickPart = particles;
+  while (tickPart)
+    {
+      tickPart->extForce += field->calcForce(tickPart->position);
+      tickPart = tickPart->next;
+    }
+}
+
 
 /**

orxonox/branches/physics/src/lib/graphics/particles/particle_system.h

@@ -31 +31 @@
 class Material;
 class ParticleEmitter;
-
+class Field;
 
 //! A struct for one Particle
@@ -39 +39 @@
   Vector position;            //!< The current position of this particle.
   Vector velocity;            //!< The current velocity of this particle.
+  Vector extForce;            //!< The external Force that influences this Particle.
   Quaternion rotation;        //!< The current rotation of this particle.
   float mass;                 //!< The mass of this particle.
@@ -68 +69 @@
   void setConserve(float conserve);
   void setMass(float mass, float randomMass);
+
+  void applyField(Field* field);
 
   void tick(float dt);