aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
diff options
context:
space:
mode:
authorRobert Adams2012-12-31 16:22:45 -0800
committerRobert Adams2012-12-31 19:57:24 -0800
commit3d0fc708647ceb734385f90e2f22be9774e2171e (patch)
tree07fa083aa3507a16c4e094beb164f9b8312fe0a4 /OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
parentBulletSim: nearly complete in conversion from BulletSimAPI to BSAPITemplate. ... (diff)
downloadopensim-SC_OLD-3d0fc708647ceb734385f90e2f22be9774e2171e.zip
opensim-SC_OLD-3d0fc708647ceb734385f90e2f22be9774e2171e.tar.gz
opensim-SC_OLD-3d0fc708647ceb734385f90e2f22be9774e2171e.tar.bz2
opensim-SC_OLD-3d0fc708647ceb734385f90e2f22be9774e2171e.tar.xz
BulletSim: complete movement of BulletSimAPI functions to BSAPITemplate.
Update BulletSim DLLs and SOs with simplier step function interface.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs')
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
index a040928..c8f4602 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
@@ -187,11 +187,11 @@ public class BulletConstraint
187// Made a class rather than a struct so there would be only one 187// Made a class rather than a struct so there would be only one
188// instance of this and C# will pass around pointers rather 188// instance of this and C# will pass around pointers rather
189// than making copies. 189// than making copies.
190public class BulletHeightMapInfo 190public class BulletHMapInfo
191{ 191{
192 public BulletHeightMapInfo(uint id, float[] hm, IntPtr xx) { 192 public BulletHMapInfo(uint id, float[] hm, IntPtr xx) {
193 ID = id; 193 ID = id;
194 Ptr = xx; 194 ptr = xx;
195 heightMap = hm; 195 heightMap = hm;
196 terrainRegionBase = OMV.Vector3.Zero; 196 terrainRegionBase = OMV.Vector3.Zero;
197 minCoords = new OMV.Vector3(100f, 100f, 25f); 197 minCoords = new OMV.Vector3(100f, 100f, 25f);
@@ -200,7 +200,7 @@ public class BulletHeightMapInfo
200 sizeX = sizeY = 256f; 200 sizeX = sizeY = 256f;
201 } 201 }
202 public uint ID; 202 public uint ID;
203 public IntPtr Ptr; 203 public IntPtr ptr;
204 public float[] heightMap; 204 public float[] heightMap;
205 public OMV.Vector3 terrainRegionBase; 205 public OMV.Vector3 terrainRegionBase;
206 public OMV.Vector3 minCoords; 206 public OMV.Vector3 minCoords;