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.

1 files changed, 2 insertions, 16 deletions

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
index 64a886b..a618a21 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
@@ -302,10 +302,6 @@ public abstract BulletWorld Initialize(Vector3 maxPosition, ConfigurationParamet
                                                                                         int maxUpdates, ref EntityProperties[] updateArray
                                             );
 
-    /*
-public abstract void SetHeightMap(BulletWorld world, float[] heightmap);
-
-     */
 public abstract int PhysicsStep(BulletWorld world, float timeStep, int maxSubSteps, float fixedTimeStep,
                         out int updatedEntityCount, out int collidersCount);
 
@@ -369,18 +365,10 @@ public abstract void ReleaseBodyInfo(IntPtr obj);
 public abstract void DestroyObject(BulletWorld sim, BulletBody obj);
 
 // =====================================================================================
-// Terrain creation and helper routines
-public abstract IntPtr CreateHeightMapInfo(BulletWorld sim, uint id, Vector3 minCoords, Vector3 maxCoords,
-        float[] heightMap, float collisionMargin);
-
-public abstract IntPtr FillHeightMapInfo(BulletWorld sim, IntPtr mapInfo, uint id, Vector3 minCoords, Vector3 maxCoords,
-        float[] heightMap, float collisionMargin);
-
-public abstract bool ReleaseHeightMapInfo(IntPtr heightMapInfo);
-
 public abstract BulletShape CreateGroundPlaneShape(uint id, float height, float collisionMargin);
 
-public abstract BulletShape CreateTerrainShape(IntPtr mapInfo);
+public abstract BulletShape CreateTerrainShape(uint id, Vector3 size, float minHeight, float maxHeight, float[] heightMap, 

+                                                                float scaleFactor, float collisionMargin);
 
 // =====================================================================================
 // Constraint creation and helper routines
@@ -667,8 +655,6 @@ public abstract void DumpRigidBody(BulletWorld sim, BulletBody collisionObject);
 
 public abstract void DumpCollisionShape(BulletWorld sim, BulletShape collisionShape);
 
-public abstract void DumpMapInfo(BulletWorld sim, BulletHMapInfo mapInfo);
-
 public abstract void DumpConstraint(BulletWorld sim, BulletConstraint constrain);
 
 public abstract void DumpActivationInfo(BulletWorld sim);