diff options
author | teravus | 2012-12-18 15:00:10 -0500 |
---|---|---|
committer | teravus | 2012-12-18 15:00:10 -0500 |
commit | 29cdf0f3dd99605192f29fc83bbacdf8ecb0ea8d (patch) | |
tree | 9b8eda52bcd2022e47b0b0688eb9d548b4161f36 /OpenSim/Region/Physics/BulletSNPlugin/BSTerrainManager.cs | |
parent | BulletSim: scale the force for external AddForce by the simulation (diff) | |
download | opensim-SC_OLD-29cdf0f3dd99605192f29fc83bbacdf8ecb0ea8d.zip opensim-SC_OLD-29cdf0f3dd99605192f29fc83bbacdf8ecb0ea8d.tar.gz opensim-SC_OLD-29cdf0f3dd99605192f29fc83bbacdf8ecb0ea8d.tar.bz2 opensim-SC_OLD-29cdf0f3dd99605192f29fc83bbacdf8ecb0ea8d.tar.xz |
* Merges BulletSim Updates to BulletSimN(BulletSNPlugin)
Diffstat (limited to 'OpenSim/Region/Physics/BulletSNPlugin/BSTerrainManager.cs')
-rw-r--r-- | OpenSim/Region/Physics/BulletSNPlugin/BSTerrainManager.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSNPlugin/BSTerrainManager.cs b/OpenSim/Region/Physics/BulletSNPlugin/BSTerrainManager.cs index dfad70e..66d62f0 100644 --- a/OpenSim/Region/Physics/BulletSNPlugin/BSTerrainManager.cs +++ b/OpenSim/Region/Physics/BulletSNPlugin/BSTerrainManager.cs | |||
@@ -140,7 +140,7 @@ public sealed class BSTerrainManager : IDisposable | |||
140 | m_groundPlane = new BulletBody(BSScene.GROUNDPLANE_ID, | 140 | m_groundPlane = new BulletBody(BSScene.GROUNDPLANE_ID, |
141 | BulletSimAPI.CreateBodyWithDefaultMotionState2(groundPlaneShape.ptr, BSScene.GROUNDPLANE_ID, | 141 | BulletSimAPI.CreateBodyWithDefaultMotionState2(groundPlaneShape.ptr, BSScene.GROUNDPLANE_ID, |
142 | Vector3.Zero, Quaternion.Identity)); | 142 | Vector3.Zero, Quaternion.Identity)); |
143 | BulletSimAPI.AddObjectToWorld2(PhysicsScene.World.ptr, m_groundPlane.ptr); | 143 | BulletSimAPI.AddObjectToWorld2(PhysicsScene.World.ptr, m_groundPlane.ptr, Vector3.Zero, Quaternion.Identity); |
144 | BulletSimAPI.UpdateSingleAabb2(PhysicsScene.World.ptr, m_groundPlane.ptr); | 144 | BulletSimAPI.UpdateSingleAabb2(PhysicsScene.World.ptr, m_groundPlane.ptr); |
145 | // Ground plane does not move | 145 | // Ground plane does not move |
146 | BulletSimAPI.ForceActivationState2(m_groundPlane.ptr, ActivationState.DISABLE_SIMULATION); | 146 | BulletSimAPI.ForceActivationState2(m_groundPlane.ptr, ActivationState.DISABLE_SIMULATION); |
@@ -376,6 +376,7 @@ public sealed class BSTerrainManager : IDisposable | |||
376 | DetailLog("{0},BSTerrainManager.GetTerrainHeightAtXYZ,terrainNotFound,pos={1},base={2}", | 376 | DetailLog("{0},BSTerrainManager.GetTerrainHeightAtXYZ,terrainNotFound,pos={1},base={2}", |
377 | BSScene.DetailLogZero, pos, terrainBaseXYZ); | 377 | BSScene.DetailLogZero, pos, terrainBaseXYZ); |
378 | } | 378 | } |
379 | |||
379 | lastHeight = ret; | 380 | lastHeight = ret; |
380 | return ret; | 381 | return ret; |
381 | } | 382 | } |