aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
diff options
context:
space:
mode:
authorRobert Adams2012-12-31 16:54:39 -0800
committerRobert Adams2012-12-31 19:57:25 -0800
commit9396ccc078516023d63b5a86b3262ff97a1e97fb (patch)
treee02d28a4bf16a98625f359358f883e866f5339d4 /OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
parentBulletSim: complete movement of BulletSimAPI functions to BSAPITemplate. (diff)
downloadopensim-SC-9396ccc078516023d63b5a86b3262ff97a1e97fb.zip
opensim-SC-9396ccc078516023d63b5a86b3262ff97a1e97fb.tar.gz
opensim-SC-9396ccc078516023d63b5a86b3262ff97a1e97fb.tar.bz2
opensim-SC-9396ccc078516023d63b5a86b3262ff97a1e97fb.tar.xz
BulletSim: eliminate the use of the unmanaged HeightMapInfo structure.
Remove all related calls from the unmanaged and BSAPITemplate interfaces. Update DLLs and SOs to include the version without HeightMapInfo structures.
Diffstat (limited to '')
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
index c8f4602..681d21e 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
@@ -189,9 +189,8 @@ public class BulletConstraint
189// than making copies. 189// than making copies.
190public class BulletHMapInfo 190public class BulletHMapInfo
191{ 191{
192 public BulletHMapInfo(uint id, float[] hm, IntPtr xx) { 192 public BulletHMapInfo(uint id, float[] hm) {
193 ID = id; 193 ID = id;
194 ptr = xx;
195 heightMap = hm; 194 heightMap = hm;
196 terrainRegionBase = OMV.Vector3.Zero; 195 terrainRegionBase = OMV.Vector3.Zero;
197 minCoords = new OMV.Vector3(100f, 100f, 25f); 196 minCoords = new OMV.Vector3(100f, 100f, 25f);
@@ -200,7 +199,6 @@ public class BulletHMapInfo
200 sizeX = sizeY = 256f; 199 sizeX = sizeY = 256f;
201 } 200 }
202 public uint ID; 201 public uint ID;
203 public IntPtr ptr;
204 public float[] heightMap; 202 public float[] heightMap;
205 public OMV.Vector3 terrainRegionBase; 203 public OMV.Vector3 terrainRegionBase;
206 public OMV.Vector3 minCoords; 204 public OMV.Vector3 minCoords;