diff options
author | Robert Adams | 2012-12-27 18:19:25 -0800 |
---|---|---|
committer | Robert Adams | 2012-12-27 22:12:28 -0800 |
commit | c1e7539c77480b839d513dbb7db74aa8f260eba0 (patch) | |
tree | c67c637a678b0ec432438eb56a66481a258eab19 /OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | |
parent | BulletSim: move logic for IsColliding, CollidingGround and CollidingObj from ... (diff) | |
download | opensim-SC_OLD-c1e7539c77480b839d513dbb7db74aa8f260eba0.zip opensim-SC_OLD-c1e7539c77480b839d513dbb7db74aa8f260eba0.tar.gz opensim-SC_OLD-c1e7539c77480b839d513dbb7db74aa8f260eba0.tar.bz2 opensim-SC_OLD-c1e7539c77480b839d513dbb7db74aa8f260eba0.tar.xz |
BulletSim: Parameterize nominal frame rate (55) and add parameters to dynamially turn on/off detailed, unmanaged data dumping of prims and vehicles.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSParam.cs')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs index 8366cef..f8f24bd 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | |||
@@ -212,6 +212,11 @@ public static class BSParam | |||
212 | (s,cf,p,v) => { s.m_fixedTimeStep = cf.GetFloat(p, v); }, | 212 | (s,cf,p,v) => { s.m_fixedTimeStep = cf.GetFloat(p, v); }, |
213 | (s) => { return (float)s.m_fixedTimeStep; }, | 213 | (s) => { return (float)s.m_fixedTimeStep; }, |
214 | (s,p,l,v) => { s.m_fixedTimeStep = v; } ), | 214 | (s,p,l,v) => { s.m_fixedTimeStep = v; } ), |
215 | new ParameterDefn("NominalFrameRate", "The base frame rate we claim", | ||
216 | 55f, | ||
217 | (s,cf,p,v) => { s.NominalFrameRate = cf.GetInt(p, (int)v); }, | ||
218 | (s) => { return (float)s.NominalFrameRate; }, | ||
219 | (s,p,l,v) => { s.NominalFrameRate = (int)v; } ), | ||
215 | new ParameterDefn("MaxCollisionsPerFrame", "Max collisions returned at end of each frame", | 220 | new ParameterDefn("MaxCollisionsPerFrame", "Max collisions returned at end of each frame", |
216 | 2048f, | 221 | 2048f, |
217 | (s,cf,p,v) => { s.m_maxCollisionsPerFrame = cf.GetInt(p, (int)v); }, | 222 | (s,cf,p,v) => { s.m_maxCollisionsPerFrame = cf.GetInt(p, (int)v); }, |