diff options
| author | Robert Adams | 2012-10-17 08:30:10 -0700 |
|---|---|---|
| committer | Robert Adams | 2012-10-19 10:52:23 -0700 |
| commit | e87a179c893ef246dae8338e0f56c3fe20458fbc (patch) | |
| tree | 1699e1fc26a47ba000bbd2392df894dc3247f956 /OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |
| parent | BulletSim: remove code in ShapeCollection that hinted at shape sharing. (diff) | |
| download | opensim-SC_OLD-e87a179c893ef246dae8338e0f56c3fe20458fbc.zip opensim-SC_OLD-e87a179c893ef246dae8338e0f56c3fe20458fbc.tar.gz opensim-SC_OLD-e87a179c893ef246dae8338e0f56c3fe20458fbc.tar.bz2 opensim-SC_OLD-e87a179c893ef246dae8338e0f56c3fe20458fbc.tar.xz | |
BulletSim: change nonimal physics frame rate to 55 to give same numbers as ODE.
Change character scaling to represent size of capsule (diameter rather than radius)
Modify create capsule call to pass radius and height.
Eliminate errors when calculating shape inertia (should have some type checking).
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs index 30754a7..24d8db6 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |||
| @@ -608,7 +608,7 @@ public static extern IntPtr BuildNativeShape2(IntPtr world, ShapeData shapeData) | |||
| 608 | public static extern bool IsNativeShape2(IntPtr shape); | 608 | public static extern bool IsNativeShape2(IntPtr shape); |
| 609 | 609 | ||
| 610 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 610 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
| 611 | public static extern IntPtr BuildCapsuleShape2(IntPtr world, ShapeData shapeData); | 611 | public static extern IntPtr BuildCapsuleShape2(IntPtr world, float radius, float height, Vector3 scale); |
| 612 | 612 | ||
| 613 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 613 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
| 614 | public static extern IntPtr CreateCompoundShape2(IntPtr sim); | 614 | public static extern IntPtr CreateCompoundShape2(IntPtr sim); |