diff options
author | Melanie | 2012-12-28 08:32:34 +0000 |
---|---|---|
committer | Melanie | 2012-12-28 08:32:34 +0000 |
commit | 3ab1bd04031ca0bc1039e4e1d267ea19d0017430 (patch) | |
tree | 3f2417f3b96e151642158d29d1982dee2bd850a8 /OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | BulletSim: correct collision mask definition for linkset children. (diff) | |
download | opensim-SC_OLD-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.zip opensim-SC_OLD-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.tar.gz opensim-SC_OLD-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.tar.bz2 opensim-SC_OLD-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSParam.cs')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs index 7454718..f8f24bd 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | |||
@@ -89,6 +89,18 @@ public static class BSParam | |||
89 | public static float PID_D { get; private set; } // derivative | 89 | public static float PID_D { get; private set; } // derivative |
90 | public static float PID_P { get; private set; } // proportional | 90 | public static float PID_P { get; private set; } // proportional |
91 | 91 | ||
92 | // Various constants that come from that other virtual world that shall not be named | ||
93 | public const float MinGravityZ = -1f; | ||
94 | public const float MaxGravityZ = 28f; | ||
95 | public const float MinFriction = 0f; | ||
96 | public const float MaxFriction = 255f; | ||
97 | public const float MinDensity = 0f; | ||
98 | public const float MaxDensity = 22587f; | ||
99 | public const float MinRestitution = 0f; | ||
100 | public const float MaxRestitution = 1f; | ||
101 | public const float MaxAddForceMagnitude = 20000f; | ||
102 | |||
103 | // =========================================================================== | ||
92 | public delegate void ParamUser(BSScene scene, IConfig conf, string paramName, float val); | 104 | public delegate void ParamUser(BSScene scene, IConfig conf, string paramName, float val); |
93 | public delegate float ParamGet(BSScene scene); | 105 | public delegate float ParamGet(BSScene scene); |
94 | public delegate void ParamSet(BSScene scene, string paramName, uint localID, float val); | 106 | public delegate void ParamSet(BSScene scene, string paramName, uint localID, float val); |
@@ -200,6 +212,11 @@ public static class BSParam | |||
200 | (s,cf,p,v) => { s.m_fixedTimeStep = cf.GetFloat(p, v); }, | 212 | (s,cf,p,v) => { s.m_fixedTimeStep = cf.GetFloat(p, v); }, |
201 | (s) => { return (float)s.m_fixedTimeStep; }, | 213 | (s) => { return (float)s.m_fixedTimeStep; }, |
202 | (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; } ), | ||
203 | new ParameterDefn("MaxCollisionsPerFrame", "Max collisions returned at end of each frame", | 220 | new ParameterDefn("MaxCollisionsPerFrame", "Max collisions returned at end of each frame", |
204 | 2048f, | 221 | 2048f, |
205 | (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); }, |