diff options
author | Robert Adams | 2012-12-30 10:21:47 -0800 |
---|---|---|
committer | Robert Adams | 2012-12-31 19:57:22 -0800 |
commit | 9218748321519ed04da5cdffa1f29e69030171b5 (patch) | |
tree | 7516cfbea32d716651430bc3124dbdd4cb772105 /OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |
parent | BulletSim: add the implementation files for the two versions of Bullet: (diff) | |
download | opensim-SC_OLD-9218748321519ed04da5cdffa1f29e69030171b5.zip opensim-SC_OLD-9218748321519ed04da5cdffa1f29e69030171b5.tar.gz opensim-SC_OLD-9218748321519ed04da5cdffa1f29e69030171b5.tar.bz2 opensim-SC_OLD-9218748321519ed04da5cdffa1f29e69030171b5.tar.xz |
BulletSim: another round of conversion: dynamics world and collision object functions.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs index 6b76151..b119f22 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |||
@@ -367,7 +367,6 @@ public abstract void ReleaseBodyInfo(IntPtr obj); | |||
367 | 367 | ||
368 | public abstract void DestroyObject(BulletWorld sim, BulletBody obj); | 368 | public abstract void DestroyObject(BulletWorld sim, BulletBody obj); |
369 | 369 | ||
370 | /* | ||
371 | // ===================================================================================== | 370 | // ===================================================================================== |
372 | // Terrain creation and helper routines | 371 | // Terrain creation and helper routines |
373 | public abstract IntPtr CreateHeightMapInfo(BulletWorld sim, uint id, Vector3 minCoords, Vector3 maxCoords, | 372 | public abstract IntPtr CreateHeightMapInfo(BulletWorld sim, uint id, Vector3 minCoords, Vector3 maxCoords, |
@@ -378,9 +377,9 @@ public abstract IntPtr FillHeightMapInfo(BulletWorld sim, IntPtr mapInfo, uint i | |||
378 | 377 | ||
379 | public abstract bool ReleaseHeightMapInfo(IntPtr heightMapInfo); | 378 | public abstract bool ReleaseHeightMapInfo(IntPtr heightMapInfo); |
380 | 379 | ||
381 | public abstract BulletBody CreateGroundPlaneShape(uint id, float height, float collisionMargin); | 380 | public abstract BulletShape CreateGroundPlaneShape(uint id, float height, float collisionMargin); |
382 | 381 | ||
383 | public abstract BulletBody CreateTerrainShape(IntPtr mapInfo); | 382 | public abstract BulletShape CreateTerrainShape(IntPtr mapInfo); |
384 | 383 | ||
385 | // ===================================================================================== | 384 | // ===================================================================================== |
386 | // Constraint creation and helper routines | 385 | // Constraint creation and helper routines |
@@ -460,7 +459,7 @@ public abstract bool IsStaticOrKinematicObject(BulletBody obj); | |||
460 | 459 | ||
461 | public abstract bool HasContactResponse(BulletBody obj); | 460 | public abstract bool HasContactResponse(BulletBody obj); |
462 | 461 | ||
463 | public abstract void SetCollisionShape(BulletWorld sim, BulletBody obj, BulletBody shape); | 462 | public abstract void SetCollisionShape(BulletWorld sim, BulletBody obj, BulletShape shape); |
464 | 463 | ||
465 | public abstract BulletShape GetCollisionShape(BulletBody obj); | 464 | public abstract BulletShape GetCollisionShape(BulletBody obj); |
466 | 465 | ||
@@ -526,6 +525,7 @@ public abstract IntPtr GetUserPointer(BulletBody obj); | |||
526 | 525 | ||
527 | public abstract void SetUserPointer(BulletBody obj, IntPtr val); | 526 | public abstract void SetUserPointer(BulletBody obj, IntPtr val); |
528 | 527 | ||
528 | /* | ||
529 | // ===================================================================================== | 529 | // ===================================================================================== |
530 | // btRigidBody entries | 530 | // btRigidBody entries |
531 | public abstract void ApplyGravity(BulletBody obj); | 531 | public abstract void ApplyGravity(BulletBody obj); |