diff options
author | Robert Adams | 2014-03-23 13:08:31 -0700 |
---|---|---|
committer | Robert Adams | 2014-03-23 13:08:31 -0700 |
commit | b0cb0ec02f5f567539b340727727bee1a43836e6 (patch) | |
tree | 32d1b99f3edd0901783a46b800822aa5b7fd2f91 /OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs | |
parent | Added missing quotes in Robust.HG.ini.example (diff) | |
download | opensim-SC_OLD-b0cb0ec02f5f567539b340727727bee1a43836e6.zip opensim-SC_OLD-b0cb0ec02f5f567539b340727727bee1a43836e6.tar.gz opensim-SC_OLD-b0cb0ec02f5f567539b340727727bee1a43836e6.tar.bz2 opensim-SC_OLD-b0cb0ec02f5f567539b340727727bee1a43836e6.tar.xz |
BulletSim: fix problem where axis constraints were also constraining
linear motion.
The code was limiting linear motion to be only in the positive direction
for any axis that was constrained.
Diffstat (limited to '')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs index 8b0fdeb..7e61007 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -121,8 +121,10 @@ public class BSActorLockAxis : BSActor | |||
121 | // The constraint is tied to the world and oriented to the prim. | 121 | // The constraint is tied to the world and oriented to the prim. |
122 | 122 | ||
123 | // Free to move linearly in the region | 123 | // Free to move linearly in the region |
124 | OMV.Vector3 linearLow = OMV.Vector3.Zero; | 124 | // OMV.Vector3 linearLow = OMV.Vector3.Zero; |
125 | OMV.Vector3 linearHigh = m_physicsScene.TerrainManager.DefaultRegionSize; | 125 | // OMV.Vector3 linearHigh = m_physicsScene.TerrainManager.DefaultRegionSize; |
126 | OMV.Vector3 linearLow = new OMV.Vector3(-10000f, -10000f, -10000f); | ||
127 | OMV.Vector3 linearHigh = new OMV.Vector3(10000f, 10000f, 10000f); | ||
126 | if (m_controllingPrim.LockedLinearAxis.X != BSPhysObject.FreeAxis) | 128 | if (m_controllingPrim.LockedLinearAxis.X != BSPhysObject.FreeAxis) |
127 | { | 129 | { |
128 | linearLow.X = m_controllingPrim.RawPosition.X; | 130 | linearLow.X = m_controllingPrim.RawPosition.X; |