aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
authorRobert Adams2013-04-02 06:40:12 -0700
committerRobert Adams2013-04-02 06:40:12 -0700
commit68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76 (patch)
tree4e6305f72c599a5a79dfa2eb74f2a912baf07dd4 /OpenSim/Region/Physics
parentBulletSim: update unmanaged API for HACD parameter passing. Bullet HACD (diff)
downloadopensim-SC_OLD-68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76.zip
opensim-SC_OLD-68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76.tar.gz
opensim-SC_OLD-68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76.tar.bz2
opensim-SC_OLD-68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76.tar.xz
BulletSim: create axis lock constraint with proper orientation and
enable axis lock functionality.
Diffstat (limited to 'OpenSim/Region/Physics')
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs6
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
index aa75663..7219617 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
@@ -36,7 +36,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
36{ 36{
37public class BSActorLockAxis : BSActor 37public class BSActorLockAxis : BSActor
38{ 38{
39 bool TryExperimentalLockAxisCode = false; 39 bool TryExperimentalLockAxisCode = true;
40 BSConstraint LockAxisConstraint = null; 40 BSConstraint LockAxisConstraint = null;
41 41
42 public BSActorLockAxis(BSScene physicsScene, BSPhysObject pObj, string actorName) 42 public BSActorLockAxis(BSScene physicsScene, BSPhysObject pObj, string actorName)
@@ -117,9 +117,7 @@ public class BSActorLockAxis : BSActor
117 RemoveAxisLockConstraint(); 117 RemoveAxisLockConstraint();
118 118
119 BSConstraint6Dof axisConstrainer = new BSConstraint6Dof(m_physicsScene.World, m_controllingPrim.PhysBody, 119 BSConstraint6Dof axisConstrainer = new BSConstraint6Dof(m_physicsScene.World, m_controllingPrim.PhysBody,
120 // OMV.Vector3.Zero, OMV.Quaternion.Identity, 120 OMV.Vector3.Zero, OMV.Quaternion.Identity,
121 OMV.Vector3.Zero, OMV.Quaternion.Inverse(m_controllingPrim.RawOrientation),
122 // OMV.Vector3.Zero, m_controllingPrim.RawOrientation,
123 false /* useLinearReferenceFrameB */, true /* disableCollisionsBetweenLinkedBodies */); 121 false /* useLinearReferenceFrameB */, true /* disableCollisionsBetweenLinkedBodies */);
124 LockAxisConstraint = axisConstrainer; 122 LockAxisConstraint = axisConstrainer;
125 m_physicsScene.Constraints.AddConstraint(LockAxisConstraint); 123 m_physicsScene.Constraints.AddConstraint(LockAxisConstraint);