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

Timestamp:

May 30, 2005, 2:19:41 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: fields are now time-independant

Location:

orxonox/trunk/src/lib/graphics/particles

Files:

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

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

@@ -243 +243 @@
       // applying force to the System.
       if (likely (tickPart->mass > 0.0))
-        tickPart->velocity += tickPart->extForce / tickPart->mass;
+        tickPart->velocity += tickPart->extForce / tickPart->mass * dt;
 
       // rendering new position.
@@ -305 +305 @@
     \param dt The time over which the field gets applied
  */
-void ParticleSystem::applyField(Field* field, float dt)
+void ParticleSystem::applyField(Field* field)
 {
   Particle* tickPart = particles;
   while (tickPart)
     {
-      tickPart->extForce += field->calcForce(dt, tickPart->position);
+      tickPart->extForce += field->calcForce(tickPart->position);
       tickPart = tickPart->next;
     }

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

@@ -59 +59 @@
 //! A class to handle ParticleSystems
 class ParticleSystem : public PhysicsInterface {
-
+  friend class ParticleEmitter;
+  
  public:
   ParticleSystem(unsigned int maxCount = PARTICLE_DEFAULT_MAX_COUNT,
@@ -97 +98 @@
   inline float getMass(void) const { return this->initialMass; };
 
-  virtual void applyField(Field* field, float dt);
+  virtual void applyField(Field* field);
 
   void addParticle(const Vector& position, const Vector& velocity, unsigned int data = 0);