diff options
author | Robert Adams | 2013-03-18 23:58:21 -0700 |
---|---|---|
committer | Robert Adams | 2013-03-19 00:00:03 -0700 |
commit | 8360223fedc5a5521878806f40bdb0c3244241cc (patch) | |
tree | f06d6440a780a93f6269b7761c52b0a3b951588e /OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs | |
parent | BulletSim: add terrain contact processing threshold parameter. Initialize con... (diff) | |
download | opensim-SC_OLD-8360223fedc5a5521878806f40bdb0c3244241cc.zip opensim-SC_OLD-8360223fedc5a5521878806f40bdb0c3244241cc.tar.gz opensim-SC_OLD-8360223fedc5a5521878806f40bdb0c3244241cc.tar.bz2 opensim-SC_OLD-8360223fedc5a5521878806f40bdb0c3244241cc.tar.xz |
BulletSim: code to generate a higher resolution terrain mesh. Parameter
TerrainMeshMagnification controls number of vertices generated per
heightmap point. Default is 3.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs b/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs index 3a27d2c..77ea3ed 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs | |||
@@ -286,7 +286,7 @@ public override void SetShapeCollisionMargin(BulletShape shape, float margin) | |||
286 | { | 286 | { |
287 | BulletShapeUnman shapeu = shape as BulletShapeUnman; | 287 | BulletShapeUnman shapeu = shape as BulletShapeUnman; |
288 | if (shapeu != null && shapeu.HasPhysicalShape) | 288 | if (shapeu != null && shapeu.HasPhysicalShape) |
289 | BSAPICPP.SetShapeCollisionMargin2(shapeu.ptr, margin); | 289 | BSAPICPP.SetShapeCollisionMargin(shapeu.ptr, margin); |
290 | } | 290 | } |
291 | 291 | ||
292 | public override BulletShape BuildCapsuleShape(BulletWorld world, float radius, float height, Vector3 scale) | 292 | public override BulletShape BuildCapsuleShape(BulletWorld world, float radius, float height, Vector3 scale) |
@@ -1420,7 +1420,7 @@ public static extern IntPtr BuildNativeShape2(IntPtr world, ShapeData shapeData) | |||
1420 | public static extern bool IsNativeShape2(IntPtr shape); | 1420 | public static extern bool IsNativeShape2(IntPtr shape); |
1421 | 1421 | ||
1422 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 1422 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
1423 | public static extern void SetShapeCollisionMargin2(IntPtr shape, float margin); | 1423 | public static extern void SetShapeCollisionMargin(IntPtr shape, float margin); |
1424 | 1424 | ||
1425 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 1425 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
1426 | public static extern IntPtr BuildCapsuleShape2(IntPtr world, float radius, float height, Vector3 scale); | 1426 | public static extern IntPtr BuildCapsuleShape2(IntPtr world, float radius, float height, Vector3 scale); |