diff options
author | Robert Adams | 2013-04-24 08:03:45 -0700 |
---|---|---|
committer | Robert Adams | 2013-04-24 08:03:45 -0700 |
commit | e324f6f3f0f8d894190cd7a9733687ac4308b2c1 (patch) | |
tree | b3a546140bf5b16ece2d6ffaea38c5d491fecb96 /OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs | |
parent | BulletSim: improve avatar stair walking up. Add more parameters to control force (diff) | |
download | opensim-SC_OLD-e324f6f3f0f8d894190cd7a9733687ac4308b2c1.zip opensim-SC_OLD-e324f6f3f0f8d894190cd7a9733687ac4308b2c1.tar.gz opensim-SC_OLD-e324f6f3f0f8d894190cd7a9733687ac4308b2c1.tar.bz2 opensim-SC_OLD-e324f6f3f0f8d894190cd7a9733687ac4308b2c1.tar.xz |
BulletSim: update DLLs and SOs to they have no dependencies on newer
glibc (2.14) since that is not yet in some Linux distributions.
Add unmanaged API calls and code for creating single convex hull shapes.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs index d0d9f34..bfeec24 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs | |||
@@ -70,6 +70,7 @@ public enum BSPhysicsShapeType | |||
70 | SHAPE_COMPOUND = 22, | 70 | SHAPE_COMPOUND = 22, |
71 | SHAPE_HEIGHTMAP = 23, | 71 | SHAPE_HEIGHTMAP = 23, |
72 | SHAPE_AVATAR = 24, | 72 | SHAPE_AVATAR = 24, |
73 | SHAPE_CONVEXHULL= 25, | ||
73 | }; | 74 | }; |
74 | 75 | ||
75 | // The native shapes have predefined shape hash keys | 76 | // The native shapes have predefined shape hash keys |
@@ -325,6 +326,12 @@ public abstract BulletShape CreateHullShape(BulletWorld world, | |||
325 | 326 | ||
326 | public abstract BulletShape BuildHullShapeFromMesh(BulletWorld world, BulletShape meshShape, HACDParams parms); | 327 | public abstract BulletShape BuildHullShapeFromMesh(BulletWorld world, BulletShape meshShape, HACDParams parms); |
327 | 328 | ||
329 | public abstract BulletShape BuildConvexHullShapeFromMesh(BulletWorld world, BulletShape meshShape); | ||
330 | |||
331 | public abstract BulletShape CreateConvexHullShape(BulletWorld world, | ||
332 | int indicesCount, int[] indices, | ||
333 | int verticesCount, float[] vertices ); | ||
334 | |||
328 | public abstract BulletShape BuildNativeShape(BulletWorld world, ShapeData shapeData); | 335 | public abstract BulletShape BuildNativeShape(BulletWorld world, ShapeData shapeData); |
329 | 336 | ||
330 | public abstract bool IsNativeShape(BulletShape shape); | 337 | public abstract bool IsNativeShape(BulletShape shape); |