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

remove a forgotten 1000.9 factor on physics fps

avinationmerge
UbitUmarov 2015-09-04 14:33:46 +01:00
parent 08f9c54554
commit a54e0339ef
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
View File

@ -367,7 +367,7 @@ namespace OpenSim.Region.Framework.Scenes
// ORIGINAL code commented out until we have time to add our own // ORIGINAL code commented out until we have time to add our own
// statistics to the statistics window // statistics to the statistics window
float physfps = ((m_pfps / 1000.0f)); float physfps = m_pfps;
//if (physfps > 600) //if (physfps > 600)
//physfps = physfps - (physfps - 600); //physfps = physfps - (physfps - 600);

2
OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
View File

@ -711,7 +711,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
// 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 * 1000f; 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

2
OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
View File

@ -3158,7 +3158,7 @@ namespace OpenSim.Region.Physics.OdePlugin
} }
} // end lock OdeLock } // end lock OdeLock
return fps * (float)ODE_STEPSIZE * 1000.0f / timeStep; return fps * (float)ODE_STEPSIZE / timeStep;
} // end Simulate } // end Simulate
public override void GetResults() public override void GetResults()

2
OpenSim/Region/Physics/OdePlugin/OdeScene.cs
View File

@ -3312,7 +3312,7 @@ namespace OpenSim.Region.Physics.OdePlugin
m_stats[ODETotalFrameMsStatName] += Util.EnvironmentTickCountSubtract(startFrameTick); m_stats[ODETotalFrameMsStatName] += Util.EnvironmentTickCountSubtract(startFrameTick);
} }
fps *= 1000.0f/timeStep; fps *= 1.0f/timeStep;
return fps; return fps;
} }

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

@ -1860,7 +1860,7 @@ namespace OpenSim.Region.Physics.OdePlugin
m_lastframe = DateTime.UtcNow; // skip also the time lost m_lastframe = DateTime.UtcNow; // skip also the time lost
} }
} }
return (float)nodeframes * ODE_STEPSIZE / timeStep * 1000.0f; return (float)nodeframes * ODE_STEPSIZE / timeStep;
} }
/// <summary> /// <summary>