OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

avinationmerge
ubit 2012-10-28 15:42:51 +01:00
parent 1bcecdaf30 db7f4074b5
commit 707fa2bdb9
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
View File

@ -1689,10 +1689,10 @@ namespace OpenSim.Region.Physics.OdePlugin
/// <returns></returns> /// <returns></returns>
public override float Simulate(float timeStep) public override float Simulate(float timeStep)
{ {
DateTime now = DateTime.UtcNow; DateTime now = DateTime.UtcNow;
TimeSpan timedif = now - m_lastframe; TimeSpan timedif = now - m_lastframe;
timeStep = (float)timedif.TotalSeconds; timeStep = (float)timedif.TotalSeconds;
m_lastframe = now;
// acumulate time so we can reduce error // acumulate time so we can reduce error
step_time += timeStep; step_time += timeStep;
@ -1703,7 +1703,6 @@ namespace OpenSim.Region.Physics.OdePlugin
if (framecount < 0) if (framecount < 0)
framecount = 0; framecount = 0;
m_lastframe = now;
framecount++; framecount++;