Revision: 7008
          http://playerstage.svn.sourceforge.net/playerstage/?rev=7008&view=rev
Author:   natepak
Date:     2008-09-09 13:39:10 +0000 (Tue, 09 Sep 2008)

Log Message:
-----------
Applied patch 2035572

Modified Paths:
--------------
    code/gazebo/trunk/server/Simulator.cc

Modified: code/gazebo/trunk/server/Simulator.cc
===================================================================
--- code/gazebo/trunk/server/Simulator.cc       2008-09-09 13:30:45 UTC (rev 
7007)
+++ code/gazebo/trunk/server/Simulator.cc       2008-09-09 13:39:10 UTC (rev 
7008)
@@ -294,12 +294,12 @@
     if (physicsUpdateRate == 0 || 
         currTime - this->prevPhysicsTime >= physicsUpdatePeriod) 
     {
-      this->simTime += step;
 
       // Update the physics engine
       if (!this->GetUserPause() ||
           (this->GetUserPause() && this->GetUserStepInc()))
       {
+        this->simTime += step;
         this->iterations++;
         this->pause=false;
         this->SetUserStepInc(!this->GetUserStepInc());
@@ -310,9 +310,9 @@
         this->pause=true;
       }
 
+      this->prevPhysicsTime = this->GetRealTime();
+
       World::Instance()->Update();
-
-      this->prevPhysicsTime = this->GetRealTime();
     }
 
     // Update the rendering


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit

Reply via email to