diff options
author | Robert Adams | 2012-12-30 14:26:57 -0800 |
---|---|---|
committer | Robert Adams | 2012-12-31 19:57:23 -0800 |
commit | c2a7af18b639646b647eb4cdff4168a2b9746ee4 (patch) | |
tree | afe36195792b9990f7defd18bc29791f7527dcff /OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |
parent | BulletSim: remove all the debug printing of pointer formatting (.ToString(X))... (diff) | |
download | opensim-SC-c2a7af18b639646b647eb4cdff4168a2b9746ee4.zip opensim-SC-c2a7af18b639646b647eb4cdff4168a2b9746ee4.tar.gz opensim-SC-c2a7af18b639646b647eb4cdff4168a2b9746ee4.tar.bz2 opensim-SC-c2a7af18b639646b647eb4cdff4168a2b9746ee4.tar.xz |
BulletSim: nearly complete in conversion from BulletSimAPI to BSAPITemplate. Only initialization and debug fuctions left.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs (renamed from OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs) | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs index b119f22..fbf362d 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs | |||
@@ -290,7 +290,7 @@ public enum ConstraintParamAxis : int | |||
290 | AXIS_ALL | 290 | AXIS_ALL |
291 | }; | 291 | }; |
292 | 292 | ||
293 | public abstract class BulletSimAPITemplate | 293 | public abstract class BSAPITemplate |
294 | { | 294 | { |
295 | /* | 295 | /* |
296 | // Initialization and simulation | 296 | // Initialization and simulation |
@@ -311,8 +311,8 @@ public abstract int PhysicsStep(BulletWorld world, float timeStep, int maxSubSte | |||
311 | out int collidersCount, | 311 | out int collidersCount, |
312 | out IntPtr collidersPtr); | 312 | out IntPtr collidersPtr); |
313 | 313 | ||
314 | public abstract bool PushUpdate(BulletBody obj); | ||
315 | */ | 314 | */ |
315 | public abstract bool PushUpdate(BulletBody obj); | ||
316 | 316 | ||
317 | // ===================================================================================== | 317 | // ===================================================================================== |
318 | // Mesh, hull, shape and body creation helper routines | 318 | // Mesh, hull, shape and body creation helper routines |
@@ -525,7 +525,6 @@ public abstract IntPtr GetUserPointer(BulletBody obj); | |||
525 | 525 | ||
526 | public abstract void SetUserPointer(BulletBody obj, IntPtr val); | 526 | public abstract void SetUserPointer(BulletBody obj, IntPtr val); |
527 | 527 | ||
528 | /* | ||
529 | // ===================================================================================== | 528 | // ===================================================================================== |
530 | // btRigidBody entries | 529 | // btRigidBody entries |
531 | public abstract void ApplyGravity(BulletBody obj); | 530 | public abstract void ApplyGravity(BulletBody obj); |
@@ -546,7 +545,6 @@ public abstract float GetAngularDamping(BulletBody obj); | |||
546 | 545 | ||
547 | public abstract float GetLinearSleepingThreshold(BulletBody obj); | 546 | public abstract float GetLinearSleepingThreshold(BulletBody obj); |
548 | 547 | ||
549 | |||
550 | public abstract void ApplyDamping(BulletBody obj, float timeStep); | 548 | public abstract void ApplyDamping(BulletBody obj, float timeStep); |
551 | 549 | ||
552 | public abstract void SetMassProps(BulletBody obj, float mass, Vector3 inertia); | 550 | public abstract void SetMassProps(BulletBody obj, float mass, Vector3 inertia); |
@@ -661,7 +659,6 @@ public abstract int GetShapeType(BulletShape shape); | |||
661 | public abstract void SetMargin(BulletShape shape, float val); | 659 | public abstract void SetMargin(BulletShape shape, float val); |
662 | 660 | ||
663 | public abstract float GetMargin(BulletShape shape); | 661 | public abstract float GetMargin(BulletShape shape); |
664 | */ | ||
665 | 662 | ||
666 | }; | 663 | }; |
667 | } | 664 | } |