diff options
author | Melanie | 2013-04-25 00:22:28 +0100 |
---|---|---|
committer | Melanie | 2013-04-25 00:22:28 +0100 |
commit | d36a52ea55ce85110353e7a7e0b3eeb0b2a3eb4a (patch) | |
tree | dc0becfcbb3e7edcea6cd4d679749394d4564254 /OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | BulletSim: version of libBulletSim.so for 32 bit systems that doesn't (diff) | |
download | opensim-SC-d36a52ea55ce85110353e7a7e0b3eeb0b2a3eb4a.zip opensim-SC-d36a52ea55ce85110353e7a7e0b3eeb0b2a3eb4a.tar.gz opensim-SC-d36a52ea55ce85110353e7a7e0b3eeb0b2a3eb4a.tar.bz2 opensim-SC-d36a52ea55ce85110353e7a7e0b3eeb0b2a3eb4a.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to '')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs index f6b4359..b37265a 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs | |||
@@ -1778,6 +1778,16 @@ private sealed class BulletConstraintXNA : BulletConstraint | |||
1778 | /* TODO */ return null; | 1778 | /* TODO */ return null; |
1779 | } | 1779 | } |
1780 | 1780 | ||
1781 | public override BulletShape BuildConvexHullShapeFromMesh(BulletWorld world, BulletShape meshShape) | ||
1782 | { | ||
1783 | /* TODO */ return null; | ||
1784 | } | ||
1785 | |||
1786 | public override BulletShape CreateConvexHullShape(BulletWorld pWorld, int pIndicesCount, int[] indices, int pVerticesCount, float[] verticesAsFloats) | ||
1787 | { | ||
1788 | /* TODO */ return null; | ||
1789 | } | ||
1790 | |||
1781 | public override BulletShape CreateMeshShape(BulletWorld pWorld, int pIndicesCount, int[] indices, int pVerticesCount, float[] verticesAsFloats) | 1791 | public override BulletShape CreateMeshShape(BulletWorld pWorld, int pIndicesCount, int[] indices, int pVerticesCount, float[] verticesAsFloats) |
1782 | { | 1792 | { |
1783 | //DumpRaw(indices,verticesAsFloats,pIndicesCount,pVerticesCount); | 1793 | //DumpRaw(indices,verticesAsFloats,pIndicesCount,pVerticesCount); |