diff options
| author | Robert Adams | 2012-10-19 10:48:45 -0700 |
|---|---|---|
| committer | Robert Adams | 2012-10-19 10:52:31 -0700 |
| commit | f422b9b388fe67c61e610c79efabd5e07512884b (patch) | |
| tree | 7ad1c226e8541742164e83cf18e8baf595061367 /OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs | |
| parent | BulletSim: change nonimal physics frame rate to 55 to give same numbers as ODE. (diff) | |
| download | opensim-SC_OLD-f422b9b388fe67c61e610c79efabd5e07512884b.zip opensim-SC_OLD-f422b9b388fe67c61e610c79efabd5e07512884b.tar.gz opensim-SC_OLD-f422b9b388fe67c61e610c79efabd5e07512884b.tar.bz2 opensim-SC_OLD-f422b9b388fe67c61e610c79efabd5e07512884b.tar.xz | |
BulletSim: reorder avatar collision checking to eliminate double collision_end.
Various tweekings to avatar shape/mass/inertia/etc.
Remove change from avatar radius to diameter. But still the avatar sinks.
Collision_end now happens immediately rather than at the next subscription time.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs index 9743d94..4106534 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs | |||
| @@ -114,6 +114,7 @@ public class BSTerrainManager | |||
| 114 | BulletSimAPI.CreateBodyWithDefaultMotionState2(groundPlaneShape.ptr, BSScene.GROUNDPLANE_ID, | 114 | BulletSimAPI.CreateBodyWithDefaultMotionState2(groundPlaneShape.ptr, BSScene.GROUNDPLANE_ID, |
| 115 | Vector3.Zero, Quaternion.Identity)); | 115 | Vector3.Zero, Quaternion.Identity)); |
| 116 | BulletSimAPI.AddObjectToWorld2(PhysicsScene.World.ptr, m_groundPlane.ptr); | 116 | BulletSimAPI.AddObjectToWorld2(PhysicsScene.World.ptr, m_groundPlane.ptr); |
| 117 | BulletSimAPI.UpdateSingleAabb2(PhysicsScene.World.ptr, m_groundPlane.ptr); | ||
| 117 | // Ground plane does not move | 118 | // Ground plane does not move |
| 118 | BulletSimAPI.ForceActivationState2(m_groundPlane.ptr, ActivationState.DISABLE_SIMULATION); | 119 | BulletSimAPI.ForceActivationState2(m_groundPlane.ptr, ActivationState.DISABLE_SIMULATION); |
| 119 | // Everything collides with the ground plane. | 120 | // Everything collides with the ground plane. |