ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 19:36:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Added some simstats to fill the simulator pane of the Statistics monitor.

Browse Source 
* I stress, this is an initial implementation and the Agents(Child and Root) are definately obviously incorrect.
This commit is contained in:
Teravus Ovares
2007-12-12 06:58:55 +00:00
parent 83f727bb7c
commit 081f4403ea
10 changed files with 335 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
View File

@@ -787,9 +787,10 @@ namespace OpenSim.Region.Physics.OdePlugin
}
}
public override void Simulate(float timeStep)
public override float Simulate(float timeStep)
{
float fps = 0;
step_time += timeStep;
@@ -800,32 +801,40 @@ namespace OpenSim.Region.Physics.OdePlugin
if (step_time >= m_SkipFramesAtms)
{
// Instead of trying to catch up, it'll do one physics frame only
step_time = ODE_STEPSIZE;
this.m_physicsiterations = 5;
if (step_time >= m_SkipFramesAtms)
{
// Instead of trying to catch up, it'll do one physics frame only
step_time = ODE_STEPSIZE;
this.m_physicsiterations = 5;
}
else
{
m_physicsiterations = 10;
}
lock (OdeLock)
{
// Process 10 frames if the sim is running normal..
// process 5 frames if the sim is running slow
try{
d.WorldSetQuickStepNumIterations(world, m_physicsiterations);
}
else
catch (System.StackOverflowException)
{
m_physicsiterations = 10;
MainLog.Instance.Error("PHYSICS", "The operating system wasn't able to allocate enough memory for the simulation. Restarting the sim.");
base.TriggerPhysicsBasedRestart();
}
lock (OdeLock)
{
// Process 10 frames if the sim is running normal..
// process 5 frames if the sim is running slow
try{
d.WorldSetQuickStepNumIterations(world, m_physicsiterations);
}
catch (System.StackOverflowException)
{
MainLog.Instance.Error("PHYSICS", "The operating system wasn't able to allocate enough memory for the simulation. Restarting the sim.");
base.TriggerPhysicsBasedRestart();
}
int i = 0;
// Figure out the Frames Per Second we're going at.
fps = (((step_time / ODE_STEPSIZE * m_physicsiterations)*2)* 10);
while (step_time > 0.0f)
{
foreach (OdeCharacter actor in _characters)
{
actor.Move(timeStep);
@@ -875,6 +884,7 @@ namespace OpenSim.Region.Physics.OdePlugin
}
}
}
return fps;
}
public override void GetResults()