diff options
author | Melanie | 2012-12-18 09:45:40 +0000 |
---|---|---|
committer | Melanie | 2012-12-18 09:45:40 +0000 |
commit | caea7601cb64be6c872dd44b61df10fb2e5f4e96 (patch) | |
tree | 9cba3186c574d3ecbef73646e0efc3ab3b68f90c /OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-caea7601cb64be6c872dd44b61df10fb2e5f4e96.zip opensim-SC_OLD-caea7601cb64be6c872dd44b61df10fb2e5f4e96.tar.gz opensim-SC_OLD-caea7601cb64be6c872dd44b61df10fb2e5f4e96.tar.bz2 opensim-SC_OLD-caea7601cb64be6c872dd44b61df10fb2e5f4e96.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs b/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs index cf0a9dc..e0faf4e 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs | |||
@@ -134,8 +134,6 @@ public class BSVMotor : BSMotor | |||
134 | Vector3 addAmount = (TargetValue - CurrentValue)/TimeScale * timeStep; | 134 | Vector3 addAmount = (TargetValue - CurrentValue)/TimeScale * timeStep; |
135 | CurrentValue += addAmount; | 135 | CurrentValue += addAmount; |
136 | 136 | ||
137 | returnCurrent = CurrentValue; | ||
138 | |||
139 | // The desired value reduces to zero which also reduces the difference with current. | 137 | // The desired value reduces to zero which also reduces the difference with current. |
140 | // If the decay time is infinite, don't decay at all. | 138 | // If the decay time is infinite, don't decay at all. |
141 | float decayFactor = 0f; | 139 | float decayFactor = 0f; |
@@ -156,6 +154,8 @@ public class BSVMotor : BSMotor | |||
156 | CurrentValue *= (Vector3.One - frictionFactor); | 154 | CurrentValue *= (Vector3.One - frictionFactor); |
157 | } | 155 | } |
158 | 156 | ||
157 | returnCurrent = CurrentValue; | ||
158 | |||
159 | MDetailLog("{0}, BSVMotor.Step,nonZero,{1},origCurr={2},origTarget={3},timeStep={4},timeScale={5},addAmnt={6},targetDecay={7},decayFact={8},fricTS={9},frictFact={10}", | 159 | MDetailLog("{0}, BSVMotor.Step,nonZero,{1},origCurr={2},origTarget={3},timeStep={4},timeScale={5},addAmnt={6},targetDecay={7},decayFact={8},fricTS={9},frictFact={10}", |
160 | BSScene.DetailLogZero, UseName, origCurrVal, origTarget, | 160 | BSScene.DetailLogZero, UseName, origCurrVal, origTarget, |
161 | timeStep, TimeScale, addAmount, | 161 | timeStep, TimeScale, addAmount, |