diff options
| author | Robert Adams | 2013-07-17 10:19:44 -0700 |
|---|---|---|
| committer | Robert Adams | 2013-07-17 10:19:44 -0700 |
| commit | 2c8bf4aaa66a4cc9fc8fd9f89825e7cd1b43f3d6 (patch) | |
| tree | 229303841ec7a044c3724e64a352d1d26505eb5c /OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |
| parent | Removed the MapItems thread. Redirected the map items requests to the service... (diff) | |
| download | opensim-SC_OLD-2c8bf4aaa66a4cc9fc8fd9f89825e7cd1b43f3d6.zip opensim-SC_OLD-2c8bf4aaa66a4cc9fc8fd9f89825e7cd1b43f3d6.tar.gz opensim-SC_OLD-2c8bf4aaa66a4cc9fc8fd9f89825e7cd1b43f3d6.tar.bz2 opensim-SC_OLD-2c8bf4aaa66a4cc9fc8fd9f89825e7cd1b43f3d6.tar.xz | |
BulletSim: fix small bug where everything looked like it was colliding
before the first simulator step.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSScene.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs index 214271b..41aca3b 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |||
| @@ -97,6 +97,9 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters | |||
| 97 | 97 | ||
| 98 | internal long m_simulationStep = 0; // The current simulation step. | 98 | internal long m_simulationStep = 0; // The current simulation step. |
| 99 | public long SimulationStep { get { return m_simulationStep; } } | 99 | public long SimulationStep { get { return m_simulationStep; } } |
| 100 | // A number to use for SimulationStep that is probably not any step value | ||
| 101 | // Used by the collision code (which remembers the step when a collision happens) to remember not any simulation step. | ||
| 102 | public static long NotASimulationStep = -1234; | ||
| 100 | 103 | ||
| 101 | internal float LastTimeStep { get; private set; } // The simulation time from the last invocation of Simulate() | 104 | internal float LastTimeStep { get; private set; } // The simulation time from the last invocation of Simulate() |
| 102 | 105 | ||