diff options
author | Robert Adams | 2013-01-01 16:49:38 -0800 |
---|---|---|
committer | Robert Adams | 2013-01-01 17:27:33 -0800 |
commit | 9d840fd2ee5c3e6c6f788e8145f06701e9ea2724 (patch) | |
tree | 063fd046a04a125671edf147161b34ed95c59329 /OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs | |
parent | BulletSim: fix line endings. (diff) | |
download | opensim-SC_OLD-9d840fd2ee5c3e6c6f788e8145f06701e9ea2724.zip opensim-SC_OLD-9d840fd2ee5c3e6c6f788e8145f06701e9ea2724.tar.gz opensim-SC_OLD-9d840fd2ee5c3e6c6f788e8145f06701e9ea2724.tar.bz2 opensim-SC_OLD-9d840fd2ee5c3e6c6f788e8145f06701e9ea2724.tar.xz |
BulletSim: move over and port the interface for BulletXNA.
Copied BulletSNPlugin.BulletSimAPI to a new
BulletSPlugin.BSAPIXNA.cs and then modifyed the latter to
comply with the BSAPITemplate definition. Not totally debugged
but the code is all there for an INI variable to select either
unmanaged C++ Bullet or the C# version of Bullet.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs index 2350f59..1735be2 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs | |||
@@ -346,10 +346,9 @@ public abstract void RecalculateCompoundShapeLocalAabb(BulletShape cShape); | |||
346 | 346 | ||
347 | public abstract BulletShape DuplicateCollisionShape(BulletWorld sim, BulletShape srcShape, uint id); | 347 | public abstract BulletShape DuplicateCollisionShape(BulletWorld sim, BulletShape srcShape, uint id); |
348 | 348 | ||
349 | |||
350 | public abstract bool DeleteCollisionShape(BulletWorld world, BulletShape shape); | 349 | public abstract bool DeleteCollisionShape(BulletWorld world, BulletShape shape); |
351 | 350 | ||
352 | public abstract int GetBodyType(BulletBody obj); | 351 | public abstract CollisionObjectTypes GetBodyType(BulletBody obj); |
353 | 352 | ||
354 | public abstract BulletBody CreateBodyFromShape(BulletWorld sim, BulletShape shape, uint id, Vector3 pos, Quaternion rot); | 353 | public abstract BulletBody CreateBodyFromShape(BulletWorld sim, BulletShape shape, uint id, Vector3 pos, Quaternion rot); |
355 | 354 | ||
@@ -416,6 +415,7 @@ public abstract void SetForceUpdateAllAabbs(BulletWorld world, bool force); | |||
416 | 415 | ||
417 | // ===================================================================================== | 416 | // ===================================================================================== |
418 | // btDynamicsWorld entries | 417 | // btDynamicsWorld entries |
418 | // public abstract bool AddObjectToWorld(BulletWorld world, BulletBody obj, Vector3 pos, Quaternion rot); | ||
419 | public abstract bool AddObjectToWorld(BulletWorld world, BulletBody obj); | 419 | public abstract bool AddObjectToWorld(BulletWorld world, BulletBody obj); |
420 | 420 | ||
421 | public abstract bool RemoveObjectFromWorld(BulletWorld world, BulletBody obj); | 421 | public abstract bool RemoveObjectFromWorld(BulletWorld world, BulletBody obj); |
@@ -597,7 +597,7 @@ public abstract void SetAngularFactorV(BulletBody obj, Vector3 factor); | |||
597 | 597 | ||
598 | public abstract Vector3 GetAngularFactor(BulletBody obj); | 598 | public abstract Vector3 GetAngularFactor(BulletBody obj); |
599 | 599 | ||
600 | public abstract bool IsInWorld(BulletBody obj); | 600 | public abstract bool IsInWorld(BulletWorld world, BulletBody obj); |
601 | 601 | ||
602 | public abstract void AddConstraintRef(BulletBody obj, BulletConstraint constrain); | 602 | public abstract void AddConstraintRef(BulletBody obj, BulletConstraint constrain); |
603 | 603 | ||