Changeset 4378 in orxonox.OLD for orxonox/trunk/src/lib/graphics

Timestamp:

May 29, 2005, 2:02:56 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: applying force works for particle-systems again

Location:

orxonox/trunk/src/lib/graphics/particles

Files:

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

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

@@ -56 +56 @@
   this->setType(type, 1);
   this->setColor(1.0,1.0,1.0,1.0, .5,.5,.5,.5, .0,.0,.0,.0);
+  this->setMass(1.0, 0.0);
   ParticleEngine::getInstance()->addSystem(this);
 }
@@ -182 +183 @@
 
 /**
+   \brief sets the initial mass of any particle
+*/
+void ParticleSystem::setMass(float mass, float randomMass)
+{
+  this->initialMass = mass;
+  this->randomInitialMass = randomMass;
+}
+
+/**
    \brief sets the conserve Factor of newly created particles
 */
@@ -231 +241 @@
   while (likely(tickPart != NULL))
     {
+      // applying force to the System.
+      tickPart->velocity += tickPart->extForce * tickPart->mass;
+
+      // rendering new position.
       tickPart->position = tickPart->position + tickPart->velocity * dt;
       tickPart->radius += tickPart->radiusIt * dt;
-
-      // applying force to the System.
-      tickPart->velocity += tickPart->extForce * tickPart->mass;
+      
       tickPart->extForce = Vector(0,0,0);
 

orxonox/trunk/src/lib/graphics/particles/particle_system.h

@@ -74 +74 @@
                  float randomStartRadius = 0.0, float randomEndRadius = 0.0);
   void setConserve(float conserve);
-  void setMass(float mass, float randomMass);
+  void setMass(float mass, float randomMass = 0.0);
 
   void setColor(GLfloat br, GLfloat bg, GLfloat bb, GLfloat ba,
@@ -97 +97 @@
   inline float getMass(void) const { return this->initialMass; };
 
-  void applyField(Field* field, float dt);
+  virtual void applyField(Field* field, float dt);
 
   void tick(float dt);