diff options
| author | Melanie Thielker | 2014-06-21 00:23:11 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-06-21 00:23:11 +0200 |
| commit | 527c2cdb1ed981eb0ebb7a3c45b5c06761a4630b (patch) | |
| tree | f54e3addc4cffaab23df8fee98e8e466023ddab3 /OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs | |
| parent | Merge commit '69bc37acd66e9ac9938d4a657dc6b9a0ba9f021e' (diff) | |
| parent | BulletSim: create axis lock constraint with proper orientation and (diff) | |
| download | opensim-SC_OLD-527c2cdb1ed981eb0ebb7a3c45b5c06761a4630b.zip opensim-SC_OLD-527c2cdb1ed981eb0ebb7a3c45b5c06761a4630b.tar.gz opensim-SC_OLD-527c2cdb1ed981eb0ebb7a3c45b5c06761a4630b.tar.bz2 opensim-SC_OLD-527c2cdb1ed981eb0ebb7a3c45b5c06761a4630b.tar.xz | |
Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76'
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs index 6fc10e9..f6b4359 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs | |||
| @@ -1773,10 +1773,9 @@ private sealed class BulletConstraintXNA : BulletConstraint | |||
| 1773 | return new BulletShapeXNA(compoundshape, BSPhysicsShapeType.SHAPE_HULL); | 1773 | return new BulletShapeXNA(compoundshape, BSPhysicsShapeType.SHAPE_HULL); |
| 1774 | } | 1774 | } |
| 1775 | 1775 | ||
| 1776 | public override BulletShape BuildHullShapeFromMesh(BulletWorld world, BulletShape meshShape) | 1776 | public override BulletShape BuildHullShapeFromMesh(BulletWorld world, BulletShape meshShape, HACDParams parms) |
| 1777 | { | 1777 | { |
| 1778 | /* TODO */ return null; | 1778 | /* TODO */ return null; |
| 1779 | |||
| 1780 | } | 1779 | } |
| 1781 | 1780 | ||
| 1782 | public override BulletShape CreateMeshShape(BulletWorld pWorld, int pIndicesCount, int[] indices, int pVerticesCount, float[] verticesAsFloats) | 1781 | public override BulletShape CreateMeshShape(BulletWorld pWorld, int pIndicesCount, int[] indices, int pVerticesCount, float[] verticesAsFloats) |