Changeset 4385 in orxonox.OLD

Timestamp:

May 29, 2005, 10:19:43 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: small efficiency update

Location:

orxonox/trunk/src

Files:

• lib/graphics/particles/particle_system.cc (modified) (2 diffs)
• subprojects/particles/particle_fun.cc (modified) (1 diff)

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

@@ -242 +242 @@
     {
       // applying force to the System.
-      tickPart->velocity += tickPart->extForce * tickPart->mass;
+      if (likely (tickPart->mass > 0.0))
+        tickPart->velocity += tickPart->extForce / tickPart->mass;
 
       // rendering new position.
@@ -271 +272 @@
         tickPart->velocity = tickPart->velocity * this->conserve;
       // find out if we have to delete tickPart
-      if ((tickPart->lifeCycle += dt/tickPart->lifeTime) >= 1.0)
+      if (unlikely((tickPart->lifeCycle += dt/tickPart->lifeTime) >= 1.0))
         {
           // remove the particle from the list

orxonox/trunk/src/subprojects/particles/particle_fun.cc

@@ -411 +411 @@
       //  Window::mainWindow->connectSignal("remove", this, GuiExec::quitGui);
       Window::mainWindow->connectSignal("destroy", NULL, quitGui);
+      windowBox->fill(quitButton);
       
-      windowBox->fill(quitButton);
     }
     guiMainWindow->fill(windowBox);