diff options
author | teravus | 2012-12-18 15:00:10 -0500 |
---|---|---|
committer | teravus | 2012-12-18 15:00:10 -0500 |
commit | 29cdf0f3dd99605192f29fc83bbacdf8ecb0ea8d (patch) | |
tree | 9b8eda52bcd2022e47b0b0688eb9d548b4161f36 /OpenSim/Region/Physics/BulletSNPlugin/BSConstraint6Dof.cs | |
parent | BulletSim: scale the force for external AddForce by the simulation (diff) | |
download | opensim-SC_OLD-29cdf0f3dd99605192f29fc83bbacdf8ecb0ea8d.zip opensim-SC_OLD-29cdf0f3dd99605192f29fc83bbacdf8ecb0ea8d.tar.gz opensim-SC_OLD-29cdf0f3dd99605192f29fc83bbacdf8ecb0ea8d.tar.bz2 opensim-SC_OLD-29cdf0f3dd99605192f29fc83bbacdf8ecb0ea8d.tar.xz |
* Merges BulletSim Updates to BulletSimN(BulletSNPlugin)
Diffstat (limited to 'OpenSim/Region/Physics/BulletSNPlugin/BSConstraint6Dof.cs')
-rw-r--r-- | OpenSim/Region/Physics/BulletSNPlugin/BSConstraint6Dof.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSNPlugin/BSConstraint6Dof.cs b/OpenSim/Region/Physics/BulletSNPlugin/BSConstraint6Dof.cs index 0181d9d..d1e3f55 100644 --- a/OpenSim/Region/Physics/BulletSNPlugin/BSConstraint6Dof.cs +++ b/OpenSim/Region/Physics/BulletSNPlugin/BSConstraint6Dof.cs | |||
@@ -39,7 +39,7 @@ public sealed class BSConstraint6Dof : BSConstraint | |||
39 | public override ConstraintType Type { get { return ConstraintType.D6_CONSTRAINT_TYPE; } } | 39 | public override ConstraintType Type { get { return ConstraintType.D6_CONSTRAINT_TYPE; } } |
40 | 40 | ||
41 | // Create a btGeneric6DofConstraint | 41 | // Create a btGeneric6DofConstraint |
42 | public BSConstraint6Dof(BulletSim world, BulletBody obj1, BulletBody obj2, | 42 | public BSConstraint6Dof(BulletWorld world, BulletBody obj1, BulletBody obj2, |
43 | Vector3 frame1, Quaternion frame1rot, | 43 | Vector3 frame1, Quaternion frame1rot, |
44 | Vector3 frame2, Quaternion frame2rot, | 44 | Vector3 frame2, Quaternion frame2rot, |
45 | bool useLinearReferenceFrameA, bool disableCollisionsBetweenLinkedBodies) | 45 | bool useLinearReferenceFrameA, bool disableCollisionsBetweenLinkedBodies) |
@@ -58,7 +58,7 @@ public sealed class BSConstraint6Dof : BSConstraint | |||
58 | obj1.ID, obj1.ptr.ToString(), obj2.ID, obj2.ptr.ToString()); | 58 | obj1.ID, obj1.ptr.ToString(), obj2.ID, obj2.ptr.ToString()); |
59 | } | 59 | } |
60 | 60 | ||
61 | public BSConstraint6Dof(BulletSim world, BulletBody obj1, BulletBody obj2, | 61 | public BSConstraint6Dof(BulletWorld world, BulletBody obj1, BulletBody obj2, |
62 | Vector3 joinPoint, | 62 | Vector3 joinPoint, |
63 | bool useLinearReferenceFrameA, bool disableCollisionsBetweenLinkedBodies) | 63 | bool useLinearReferenceFrameA, bool disableCollisionsBetweenLinkedBodies) |
64 | { | 64 | { |