diff options
author | Robert Adams | 2013-01-21 09:19:09 -0800 |
---|---|---|
committer | Robert Adams | 2013-01-21 09:19:09 -0800 |
commit | 3f6698a595593edc4027ff58cbebf947a6b5ac1f (patch) | |
tree | d5f6978e4c527f8f4dd219975dce00e06ba2b20f | |
parent | BulletSim: More aggressive as setting character velocity to zero (diff) | |
download | opensim-SC_OLD-3f6698a595593edc4027ff58cbebf947a6b5ac1f.zip opensim-SC_OLD-3f6698a595593edc4027ff58cbebf947a6b5ac1f.tar.gz opensim-SC_OLD-3f6698a595593edc4027ff58cbebf947a6b5ac1f.tar.bz2 opensim-SC_OLD-3f6698a595593edc4027ff58cbebf947a6b5ac1f.tar.xz |
BulletSim: remove unused MaxTaintsToProcessPerStep parameter
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | 10 | ||||
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 1 | ||||
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs index 6a92365..2b4488a 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | |||
@@ -236,11 +236,7 @@ public static class BSParam | |||
236 | (s,cf,p,v) => { s.m_maxUpdatesPerFrame = cf.GetInt(p, (int)v); }, | 236 | (s,cf,p,v) => { s.m_maxUpdatesPerFrame = cf.GetInt(p, (int)v); }, |
237 | (s) => { return (float)s.m_maxUpdatesPerFrame; }, | 237 | (s) => { return (float)s.m_maxUpdatesPerFrame; }, |
238 | (s,p,l,v) => { s.m_maxUpdatesPerFrame = (int)v; } ), | 238 | (s,p,l,v) => { s.m_maxUpdatesPerFrame = (int)v; } ), |
239 | new ParameterDefn("MaxTaintsToProcessPerStep", "Number of update taints to process before each simulation step", | 239 | |
240 | 500f, | ||
241 | (s,cf,p,v) => { s.m_taintsToProcessPerStep = cf.GetInt(p, (int)v); }, | ||
242 | (s) => { return (float)s.m_taintsToProcessPerStep; }, | ||
243 | (s,p,l,v) => { s.m_taintsToProcessPerStep = (int)v; } ), | ||
244 | new ParameterDefn("MinObjectMass", "Minimum object mass (0.0001)", | 240 | new ParameterDefn("MinObjectMass", "Minimum object mass (0.0001)", |
245 | 0.0001f, | 241 | 0.0001f, |
246 | (s,cf,p,v) => { MinimumObjectMass = cf.GetFloat(p, v); }, | 242 | (s,cf,p,v) => { MinimumObjectMass = cf.GetFloat(p, v); }, |
@@ -261,9 +257,9 @@ public static class BSParam | |||
261 | (s,cf,p,v) => { MaxAngularVelocity = cf.GetFloat(p, v); }, | 257 | (s,cf,p,v) => { MaxAngularVelocity = cf.GetFloat(p, v); }, |
262 | (s) => { return (float)MaxAngularVelocity; }, | 258 | (s) => { return (float)MaxAngularVelocity; }, |
263 | (s,p,l,v) => { MaxAngularVelocity = v; } ), | 259 | (s,p,l,v) => { MaxAngularVelocity = v; } ), |
264 | // LL documentation says thie number should be 20f | 260 | // LL documentation says thie number should be 20f for llApplyImpulse and 200f for llRezObject |
265 | new ParameterDefn("MaxAddForceMagnitude", "Maximum force that can be applied by llApplyImpulse (SL says 20f)", | 261 | new ParameterDefn("MaxAddForceMagnitude", "Maximum force that can be applied by llApplyImpulse (SL says 20f)", |
266 | 200.0f, | 262 | 20000.0f, |
267 | (s,cf,p,v) => { MaxAddForceMagnitude = cf.GetFloat(p, v); }, | 263 | (s,cf,p,v) => { MaxAddForceMagnitude = cf.GetFloat(p, v); }, |
268 | (s) => { return (float)MaxAddForceMagnitude; }, | 264 | (s) => { return (float)MaxAddForceMagnitude; }, |
269 | (s,p,l,v) => { MaxAddForceMagnitude = v; } ), | 265 | (s,p,l,v) => { MaxAddForceMagnitude = v; } ), |
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs index e0b4992..12b1ef1 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |||
@@ -81,7 +81,6 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters | |||
81 | internal long m_simulationStep = 0; | 81 | internal long m_simulationStep = 0; |
82 | internal float NominalFrameRate { get; set; } | 82 | internal float NominalFrameRate { get; set; } |
83 | public long SimulationStep { get { return m_simulationStep; } } | 83 | public long SimulationStep { get { return m_simulationStep; } } |
84 | internal int m_taintsToProcessPerStep; | ||
85 | internal float LastTimeStep { get; private set; } | 84 | internal float LastTimeStep { get; private set; } |
86 | 85 | ||
87 | // Physical objects can register for prestep or poststep events | 86 | // Physical objects can register for prestep or poststep events |
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt b/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt index 23b7ca8..c1bf766 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt +++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt | |||
@@ -2,6 +2,8 @@ CURRENT PRIORITIES | |||
2 | ================================================= | 2 | ================================================= |
3 | Mantis 6040 script http://opensimulator.org/mantis/view.php?id=6040 | 3 | Mantis 6040 script http://opensimulator.org/mantis/view.php?id=6040 |
4 | Msg Kayaker on OSGrid when working | 4 | Msg Kayaker on OSGrid when working |
5 | when should angular and linear motor targets be zeroed? when selected? | ||
6 | Need a vehicle.clear()? Or an 'else' in prestep if not physical. | ||
5 | Teravus llMoveToTarget script debug | 7 | Teravus llMoveToTarget script debug |
6 | Mixing of hover, buoyancy/gravity, moveToTarget, into one force | 8 | Mixing of hover, buoyancy/gravity, moveToTarget, into one force |
7 | Boats floating at proper level | 9 | Boats floating at proper level |