remove a forgotten 1000.9 factor on physics fps
parent
08f9c54554
commit
a54e0339ef
|
@ -367,7 +367,7 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
|
||||
// ORIGINAL code commented out until we have time to add our own
|
||||
// statistics to the statistics window
|
||||
float physfps = ((m_pfps / 1000.0f));
|
||||
float physfps = m_pfps;
|
||||
|
||||
//if (physfps > 600)
|
||||
//physfps = physfps - (physfps - 600);
|
||||
|
|
|
@ -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.
|
||||
// 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;
|
||||
m_simulatedTime += (float)numSubSteps * m_fixedTimeStep;
|
||||
}
|
||||
|
||||
// Called by a BSPhysObject to note that it has changed properties and this information
|
||||
|
|
|
@ -3158,7 +3158,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
}
|
||||
} // end lock OdeLock
|
||||
|
||||
return fps * (float)ODE_STEPSIZE * 1000.0f / timeStep;
|
||||
return fps * (float)ODE_STEPSIZE / timeStep;
|
||||
} // end Simulate
|
||||
|
||||
public override void GetResults()
|
||||
|
|
|
@ -3312,7 +3312,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
m_stats[ODETotalFrameMsStatName] += Util.EnvironmentTickCountSubtract(startFrameTick);
|
||||
}
|
||||
|
||||
fps *= 1000.0f/timeStep;
|
||||
fps *= 1.0f/timeStep;
|
||||
return fps;
|
||||
}
|
||||
|
||||
|
|
|
@ -1860,7 +1860,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
m_lastframe = DateTime.UtcNow; // skip also the time lost
|
||||
}
|
||||
}
|
||||
return (float)nodeframes * ODE_STEPSIZE / timeStep * 1000.0f;
|
||||
return (float)nodeframes * ODE_STEPSIZE / timeStep;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
Loading…
Reference in New Issue