aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorRobert Adams2012-10-11 12:54:27 -0700
committerRobert Adams2012-10-11 14:01:29 -0700
commitb24190ec98f31f1e4672d1174163426b9b44e25d (patch)
tree1e720ac978101d05c0361d7b65171d6cae1c9b9c /OpenSim
parentBulletSim: normalize physics FPS to 45 (for real this time). (diff)
downloadopensim-SC_OLD-b24190ec98f31f1e4672d1174163426b9b44e25d.zip
opensim-SC_OLD-b24190ec98f31f1e4672d1174163426b9b44e25d.tar.gz
opensim-SC_OLD-b24190ec98f31f1e4672d1174163426b9b44e25d.tar.bz2
opensim-SC_OLD-b24190ec98f31f1e4672d1174163426b9b44e25d.tar.xz
BulletSim: remove some unused API2 calls because they were removed from Bullet 2.81
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs4
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs12
2 files changed, 2 insertions, 14 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 692713d..6a4365c 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -673,8 +673,8 @@ public sealed class BSPrim : BSPhysObject
673 673
674 // Force activation of the object so Bullet will act on it. 674 // Force activation of the object so Bullet will act on it.
675 // Must do the ForceActivationState2() to overcome the DISABLE_SIMULATION from static objects. 675 // Must do the ForceActivationState2() to overcome the DISABLE_SIMULATION from static objects.
676 BulletSimAPI.ForceActivationState2(BSBody.ptr, ActivationState.ISLAND_SLEEPING); 676 BulletSimAPI.ForceActivationState2(BSBody.ptr, ActivationState.ACTIVE_TAG);
677 BulletSimAPI.Activate2(BSBody.ptr, true); 677 // BulletSimAPI.Activate2(BSBody.ptr, true);
678 678
679 BSBody.collisionFilter = CollisionFilterGroups.ObjectFilter; 679 BSBody.collisionFilter = CollisionFilterGroups.ObjectFilter;
680 BSBody.collisionMask = CollisionFilterGroups.ObjectMask; 680 BSBody.collisionMask = CollisionFilterGroups.ObjectMask;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
index e23fe5a..276111c 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
@@ -1039,18 +1039,6 @@ public static extern IntPtr GetConstraintRef2(IntPtr obj, int index);
1039public static extern int GetNumConstraintRefs2(IntPtr obj); 1039public static extern int GetNumConstraintRefs2(IntPtr obj);
1040 1040
1041[DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] 1041[DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
1042public static extern Vector3 GetDeltaLinearVelocity2(IntPtr obj);
1043
1044[DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
1045public static extern Vector3 GetDeltaAngularVelocity2(IntPtr obj);
1046
1047[DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
1048public static extern Vector3 GetPushVelocity2(IntPtr obj);
1049
1050[DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
1051public static extern Vector3 GetTurnVelocity2(IntPtr obj);
1052
1053[DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
1054public static extern void SetCollisionFilterMask2(IntPtr body, uint filter, uint mask); 1042public static extern void SetCollisionFilterMask2(IntPtr body, uint filter, uint mask);
1055 1043
1056// ===================================================================================== 1044// =====================================================================================