diff options
author | Robert Adams | 2013-08-07 07:56:37 -0700 |
---|---|---|
committer | Robert Adams | 2013-09-11 09:11:39 -0700 |
commit | 0971c7ae77cae3d238be31f46994b4692af949e3 (patch) | |
tree | 8c4ab35792d43b7bf3eeb781a7fa5a6c228ee30e /OpenSim/Region/Physics/BulletSPlugin/BSConstraint6Dof.cs | |
parent | BulletSim: add spring constraint to linkset constraint types. (diff) | |
download | opensim-SC-0971c7ae77cae3d238be31f46994b4692af949e3.zip opensim-SC-0971c7ae77cae3d238be31f46994b4692af949e3.tar.gz opensim-SC-0971c7ae77cae3d238be31f46994b4692af949e3.tar.bz2 opensim-SC-0971c7ae77cae3d238be31f46994b4692af949e3.tar.xz |
BulletSim: complete linkage of spring constraint into linkset constraint.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSConstraint6Dof.cs')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSConstraint6Dof.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint6Dof.cs b/OpenSim/Region/Physics/BulletSPlugin/BSConstraint6Dof.cs index d0949f5..5008ff7 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint6Dof.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSConstraint6Dof.cs | |||
@@ -32,12 +32,19 @@ using OpenMetaverse; | |||
32 | namespace OpenSim.Region.Physics.BulletSPlugin | 32 | namespace OpenSim.Region.Physics.BulletSPlugin |
33 | { | 33 | { |
34 | 34 | ||
35 | public sealed class BSConstraint6Dof : BSConstraint | 35 | public class BSConstraint6Dof : BSConstraint |
36 | { | 36 | { |
37 | private static string LogHeader = "[BULLETSIM 6DOF CONSTRAINT]"; | 37 | private static string LogHeader = "[BULLETSIM 6DOF CONSTRAINT]"; |
38 | 38 | ||
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 | public BSConstraint6Dof(BulletWorld world, BulletBody obj1, BulletBody obj2) :base(world) | ||
42 | { | ||
43 | m_body1 = obj1; | ||
44 | m_body2 = obj2; | ||
45 | m_enabled = false; | ||
46 | } | ||
47 | |||
41 | // Create a btGeneric6DofConstraint | 48 | // Create a btGeneric6DofConstraint |
42 | public BSConstraint6Dof(BulletWorld world, BulletBody obj1, BulletBody obj2, | 49 | public BSConstraint6Dof(BulletWorld world, BulletBody obj1, BulletBody obj2, |
43 | Vector3 frame1, Quaternion frame1rot, | 50 | Vector3 frame1, Quaternion frame1rot, |