aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
diff options
context:
space:
mode:
authorRobert Adams2012-11-20 14:51:50 -0800
committerRobert Adams2012-11-21 16:43:14 -0800
commit71b9640dfa67e830769aad64ef208d767e102c92 (patch)
treea4929a0626d4d5c2f738e5457931581dd6bdd64c /OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
parentBulletSim: rename SHAPE_AVATAR to SHAPE_CAPSULE with the eye to eventually ha... (diff)
downloadopensim-SC_OLD-71b9640dfa67e830769aad64ef208d767e102c92.zip
opensim-SC_OLD-71b9640dfa67e830769aad64ef208d767e102c92.tar.gz
opensim-SC_OLD-71b9640dfa67e830769aad64ef208d767e102c92.tar.bz2
opensim-SC_OLD-71b9640dfa67e830769aad64ef208d767e102c92.tar.xz
BulletSim: pull heightmap implementation out of the terrain manager so a mesh terrain can be implemented.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
index 407d6d7..bab3b3d 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
@@ -152,7 +152,7 @@ public class BulletHeightMapInfo
152 ID = id; 152 ID = id;
153 Ptr = xx; 153 Ptr = xx;
154 heightMap = hm; 154 heightMap = hm;
155 terrainRegionBase = new Vector2(0f, 0f); 155 terrainRegionBase = Vector3.Zero;
156 minCoords = new Vector3(100f, 100f, 25f); 156 minCoords = new Vector3(100f, 100f, 25f);
157 maxCoords = new Vector3(101f, 101f, 26f); 157 maxCoords = new Vector3(101f, 101f, 26f);
158 minZ = maxZ = 0f; 158 minZ = maxZ = 0f;
@@ -161,7 +161,7 @@ public class BulletHeightMapInfo
161 public uint ID; 161 public uint ID;
162 public IntPtr Ptr; 162 public IntPtr Ptr;
163 public float[] heightMap; 163 public float[] heightMap;
164 public Vector2 terrainRegionBase; 164 public Vector3 terrainRegionBase;
165 public Vector3 minCoords; 165 public Vector3 minCoords;
166 public Vector3 maxCoords; 166 public Vector3 maxCoords;
167 public float sizeX, sizeY; 167 public float sizeX, sizeY;