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

recover bulletS fps math change lost in merge

avinationmerge
UbitUmarov 2015-09-17 08:45:52 +01:00
parent 812e808cee
commit 6bca0c9c9c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/PhysicsModules/BulletS/BSScene.cs
View File

@ -762,7 +762,8 @@ namespace OpenSim.Region.PhysicsModule.BulletS
// The physics engine returns the number of milliseconds it simulated this call. // The physics engine returns the number of milliseconds it simulated this call.
// These are summed and normalized to one second and divided by 1000 to give the reported physics FPS. // These are summed and normalized to one second and divided by 1000 to give the reported physics FPS.
// Multiply by a fixed nominal frame rate to give a rate similar to the simulator (usually 55). // Multiply by a fixed nominal frame rate to give a rate similar to the simulator (usually 55).
m_simulatedTime += (float)numSubSteps * m_fixedTimeStep * 1000f * NominalFrameRate; // m_simulatedTime += (float)numSubSteps * m_fixedTimeStep * 1000f * NominalFrameRate;
m_simulatedTime += (float)numSubSteps * m_fixedTimeStep;
} }
// Called by a BSPhysObject to note that it has changed properties and this information // Called by a BSPhysObject to note that it has changed properties and this information
@ -849,7 +850,7 @@ namespace OpenSim.Region.PhysicsModule.BulletS
// Return the framerate simulated to give the above returned results. // Return the framerate simulated to give the above returned results.
// (Race condition here but this is just bookkeeping so rare mistakes do not merit a lock). // (Race condition here but this is just bookkeeping so rare mistakes do not merit a lock).
float simTime = m_simulatedTime; float simTime = m_simulatedTime / timeStep;
m_simulatedTime = 0f; m_simulatedTime = 0f;
return simTime; return simTime;
} }