diff options
author | Robert Adams | 2012-11-06 12:04:55 -0800 |
---|---|---|
committer | Robert Adams | 2012-11-06 18:15:48 -0800 |
commit | 36d77fe27c4a49127c5d5baa4ed4653a25f1726d (patch) | |
tree | 83fab2a130e97b6c85e81573c684c2d84a4c4f54 /OpenSim/Region/Physics | |
parent | To keep things consistent allowing an UnregisterModuleInterface... Force the... (diff) | |
download | opensim-SC-36d77fe27c4a49127c5d5baa4ed4653a25f1726d.zip opensim-SC-36d77fe27c4a49127c5d5baa4ed4653a25f1726d.tar.gz opensim-SC-36d77fe27c4a49127c5d5baa4ed4653a25f1726d.tar.bz2 opensim-SC-36d77fe27c4a49127c5d5baa4ed4653a25f1726d.tar.xz |
BulletSim: Add separate linear and angular damping function calls. Add function for recalculating compound shape bounding box.
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs index 702bd77..07149d8 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |||
@@ -632,6 +632,9 @@ public static extern IntPtr RemoveChildShapeFromCompoundShapeIndex2(IntPtr cShap | |||
632 | public static extern void RemoveChildShapeFromCompoundShape2(IntPtr cShape, IntPtr removeShape); | 632 | public static extern void RemoveChildShapeFromCompoundShape2(IntPtr cShape, IntPtr removeShape); |
633 | 633 | ||
634 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 634 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
635 | public static extern void RecalculateCompoundShapeLocalAabb2(IntPtr cShape); | ||
636 | |||
637 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
635 | public static extern IntPtr DuplicateCollisionShape2(IntPtr sim, IntPtr srcShape, uint id); | 638 | public static extern IntPtr DuplicateCollisionShape2(IntPtr sim, IntPtr srcShape, uint id); |
636 | 639 | ||
637 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 640 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
@@ -919,6 +922,12 @@ public static extern Vector3 GetGravity2(IntPtr obj); | |||
919 | public static extern void SetDamping2(IntPtr obj, float lin_damping, float ang_damping); | 922 | public static extern void SetDamping2(IntPtr obj, float lin_damping, float ang_damping); |
920 | 923 | ||
921 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 924 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
925 | public static extern void SetLinearDamping2(IntPtr obj, float lin_damping); | ||
926 | |||
927 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
928 | public static extern void SetAngularDamping2(IntPtr obj, float ang_damping); | ||
929 | |||
930 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
922 | public static extern float GetLinearDamping2(IntPtr obj); | 931 | public static extern float GetLinearDamping2(IntPtr obj); |
923 | 932 | ||
924 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 933 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |