Changeset 4691 in orxonox.OLD

Timestamp:

Jun 24, 2005, 3:44:37 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: momentum works correct now (i think)

Location:

orxonox/trunk/src/lib/particles

Files:

• particle_emitter.cc (modified) (1 diff)
• particle_system.cc (modified) (3 diffs)
• particle_system.h (modified) (1 diff)

orxonox/trunk/src/lib/particles/particle_emitter.cc

@@ -149 +149 @@
   else
     return "EMITTER_DOT";
-
-
 }
 

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

@@ -271 +271 @@
       if (likely (tickPart->mass > 0.0))
         tickPart->velocity += tickPart->extForce / tickPart->mass * dt;
-
       // rendering new position.
       tickPart->position += tickPart->velocity * dt;
@@ -293 +292 @@
 
       if (this->conserve < 1.0)
-        tickPart->velocity = tickPart->velocity * this->conserve;
+      {
+        tickPart->velocity *= this->conserve;
+        tickPart->momentum *= this->conserve;
+      }
       // find out if we have to delete tickPart
       if (unlikely((tickPart->lifeCycle += dt/tickPart->lifeTime) >= 1.0))
@@ -550 +552 @@
    \brief outputs some nice debug information
 */
-void ParticleSystem::debug(void)
+void ParticleSystem::debug(void) const
 {
   PRINT(0)("  ParticleSystem %s\n", this->getName());

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

@@ -114 +114 @@
   virtual void draw(void) const;
 
-  void debug(void);
+  void debug(void) const;
 
  private: