diff options
author | Robert Adams | 2012-08-25 23:18:46 -0700 |
---|---|---|
committer | Robert Adams | 2012-08-31 11:41:18 -0700 |
commit | 7c140570db3b01eb83efc0d42a47715d3047e376 (patch) | |
tree | b077012e0c00cc7bb07f6e81e07359e14ffd2721 /OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs | |
parent | BulletSim: unify physical objects under BSPhysObjects. Now BSScene and BSLink... (diff) | |
download | opensim-SC_OLD-7c140570db3b01eb83efc0d42a47715d3047e376.zip opensim-SC_OLD-7c140570db3b01eb83efc0d42a47715d3047e376.tar.gz opensim-SC_OLD-7c140570db3b01eb83efc0d42a47715d3047e376.tar.bz2 opensim-SC_OLD-7c140570db3b01eb83efc0d42a47715d3047e376.tar.xz |
BulletSim: Changes to terrain storage and management so mega-regions work.
Moved all terrain code out of BSScene and into new BSTerrainManager.
Added logic to manage multiple terrains for mega-regions.
Added new functions to BulletSimAPI to match the library.
Moved all of the terrain creation and setup logic from C++ code to C# code.
The unused code has not yet been removed from either place. Soon.
Moved checks for avatar above ground and in bounds into BSCharacter.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs b/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs index 25084d8..d9270d1 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs | |||
@@ -48,11 +48,10 @@ public abstract class BSConstraint : IDisposable | |||
48 | { | 48 | { |
49 | if (m_enabled) | 49 | if (m_enabled) |
50 | { | 50 | { |
51 | // BulletSimAPI.RemoveConstraint(m_world.ID, m_body1.ID, m_body2.ID); | 51 | m_enabled = false; |
52 | bool success = BulletSimAPI.DestroyConstraint2(m_world.Ptr, m_constraint.Ptr); | 52 | bool success = BulletSimAPI.DestroyConstraint2(m_world.Ptr, m_constraint.Ptr); |
53 | m_world.scene.DetailLog("{0},BSConstraint.Dispose,taint,body1={1},body2={2},success={3}", BSScene.DetailLogZero, m_body1.ID, m_body2.ID, success); | 53 | m_world.scene.DetailLog("{0},BSConstraint.Dispose,taint,body1={1},body2={2},success={3}", BSScene.DetailLogZero, m_body1.ID, m_body2.ID, success); |
54 | m_constraint.Ptr = System.IntPtr.Zero; | 54 | m_constraint.Ptr = System.IntPtr.Zero; |
55 | m_enabled = false; | ||
56 | } | 55 | } |
57 | } | 56 | } |
58 | 57 | ||