simspark-cvs

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/oxygen/simulationserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv21072/oxygen/simulationserver

Modified Files:
	simulationserver.cpp 
Log Message:
merge from projectx branch

Index: simulationserver.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/simulationserver/simulationserver.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** simulationserver.cpp	15 Jun 2007 09:25:39 -0000	1.5
--- simulationserver.cpp	17 Jun 2007 13:38:32 -0000	1.6
***************
*** 36,44 ****
  {
      if (sig_num == SIGINT)
!         {
!             signal(SIGINT, CatchSignal);
!             SimulationServer::mExit = true;
!             std::cout << "(SimulationServer) caught SIGINT. exiting.\n";
!         }
  }
  
--- 36,44 ----
  {
      if (sig_num == SIGINT)
!     {
!         signal(SIGINT, CatchSignal);
!         SimulationServer::mExit = true;
!         std::cerr << "(SimulationServer) caught SIGINT. exiting.\n";
!     }
  }
  
***************
*** 188,213 ****
          (mGameControlServer.expired())
          )
!         {
!             return;
!         }
  
      if (mSimStep > 0)
          {
!             // world is stepped in discrete steps
!             while (mSumDeltaTime >= mSimStep)
!                 {
!                     mSceneServer->Update(mSimStep);
!                     mGameControlServer->Update(mSimStep);
!                     mSumDeltaTime -= mSimStep;
!                     mSimTime += mSimStep;
!                 }
!         } else
!             {
!                 // simulate passed time in one single step
!                 mSceneServer->Update(mSumDeltaTime);
!                 mGameControlServer->Update(mSumDeltaTime);
!                 mSimTime += mSumDeltaTime;
!                 mSumDeltaTime = 0;
!             }
  }
  
--- 188,213 ----
          (mGameControlServer.expired())
          )
!     {
!         return;
!     }
  
      if (mSimStep > 0)
+     {
+         // world is stepped in discrete steps
+         while (mSumDeltaTime >= mSimStep)
          {
!             mSceneServer->Update(mSimStep);
!             mGameControlServer->Update(mSimStep);
!             mSumDeltaTime -= mSimStep;
!             mSimTime += mSimStep;
!         }
!     } else
!     {
!         // simulate passed time in one single step
!         mSceneServer->Update(mSumDeltaTime);
!         mGameControlServer->Update(mSumDeltaTime);
!         mSimTime += mSumDeltaTime;
!         mSumDeltaTime = 0;
!     }
  }
  
***************
*** 282,288 ****
  
      while (! mExit)
!         {
!             Cycle();
!         }
  
      Done();
--- 282,288 ----
  
      while (! mExit)
!     {
!         Cycle();
!     }
  
      Done();
***************
*** 298,304 ****
  
      if (mAutoTime)
!         {
!             AdvanceTime(mSimStep);
!         }
      Step();
  
--- 298,304 ----
  
      if (mAutoTime)
!     {
!         AdvanceTime(mSimStep);
!     }
      Step();