diff options
| author | Justin Clark-Casey (justincc) | 2013-01-01 23:27:10 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-01-01 23:27:10 +0000 |
| commit | e8a3cc701910130e1aafb2b757737517c1cd1627 (patch) | |
| tree | f1fd4ed9cf2b8e80ea43d2a8028837874f1b193c /OpenSim/Region/Physics/BulletSPlugin/BSConstraintHinge.cs | |
| parent | Clarify that AllowLightShareFunctions setting is false, which is the default ... (diff) | |
| parent | BulletSim: remove unused unmanaged memory reference functions from BSAPITempl... (diff) | |
| download | opensim-SC-e8a3cc701910130e1aafb2b757737517c1cd1627.zip opensim-SC-e8a3cc701910130e1aafb2b757737517c1cd1627.tar.gz opensim-SC-e8a3cc701910130e1aafb2b757737517c1cd1627.tar.bz2 opensim-SC-e8a3cc701910130e1aafb2b757737517c1cd1627.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSConstraintHinge.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSConstraintHinge.cs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraintHinge.cs b/OpenSim/Region/Physics/BulletSPlugin/BSConstraintHinge.cs index a5378b9..7714a03 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSConstraintHinge.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSConstraintHinge.cs | |||
| @@ -40,15 +40,13 @@ public sealed class BSConstraintHinge : BSConstraint | |||
| 40 | Vector3 pivotInA, Vector3 pivotInB, | 40 | Vector3 pivotInA, Vector3 pivotInB, |
| 41 | Vector3 axisInA, Vector3 axisInB, | 41 | Vector3 axisInA, Vector3 axisInB, |
| 42 | bool useLinearReferenceFrameA, bool disableCollisionsBetweenLinkedBodies) | 42 | bool useLinearReferenceFrameA, bool disableCollisionsBetweenLinkedBodies) |
| 43 | : base(world) | ||
| 43 | { | 44 | { |
| 44 | m_world = world; | ||
| 45 | m_body1 = obj1; | 45 | m_body1 = obj1; |
| 46 | m_body2 = obj2; | 46 | m_body2 = obj2; |
| 47 | m_constraint = new BulletConstraint( | 47 | m_constraint = PhysicsScene.PE.CreateHingeConstraint(world, obj1, obj2, |
| 48 | BulletSimAPI.CreateHingeConstraint2(m_world.ptr, m_body1.ptr, m_body2.ptr, | 48 | pivotInA, pivotInB, axisInA, axisInB, |
| 49 | pivotInA, pivotInB, | 49 | useLinearReferenceFrameA, disableCollisionsBetweenLinkedBodies); |
| 50 | axisInA, axisInB, | ||
| 51 | useLinearReferenceFrameA, disableCollisionsBetweenLinkedBodies)); | ||
| 52 | m_enabled = true; | 50 | m_enabled = true; |
| 53 | } | 51 | } |
| 54 | 52 | ||