diff options
author | Robert Adams | 2016-01-18 07:02:48 -0800 |
---|---|---|
committer | Robert Adams | 2016-01-18 07:02:48 -0800 |
commit | 35d4298be698d9eb02974a4210c5ace867b0db35 (patch) | |
tree | ad3cb41a236cfceaac1629eaec919b522205b00a /OpenSim/Region/PhysicsModules/BulletS/BSDynamics.cs | |
parent | BulletSim: revert avatar stationary testing for having slight velocity. (diff) | |
download | opensim-SC_OLD-35d4298be698d9eb02974a4210c5ace867b0db35.zip opensim-SC_OLD-35d4298be698d9eb02974a4210c5ace867b0db35.tar.gz opensim-SC_OLD-35d4298be698d9eb02974a4210c5ace867b0db35.tar.bz2 opensim-SC_OLD-35d4298be698d9eb02974a4210c5ace867b0db35.tar.xz |
BulletSim: change method signatures for internal AddForce methods to remove
confusion about push forces. The latter is an external, physics engine interface
feature (the force parameter has a different unit if pushing vs adding force)
and that distinction is not used internally.
Diffstat (limited to 'OpenSim/Region/PhysicsModules/BulletS/BSDynamics.cs')
-rw-r--r-- | OpenSim/Region/PhysicsModules/BulletS/BSDynamics.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSDynamics.cs b/OpenSim/Region/PhysicsModules/BulletS/BSDynamics.cs index 0fc5577..313c961 100644 --- a/OpenSim/Region/PhysicsModules/BulletS/BSDynamics.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSDynamics.cs | |||
@@ -768,7 +768,7 @@ namespace OpenSim.Region.PhysicsModule.BulletS | |||
768 | } | 768 | } |
769 | 769 | ||
770 | if ((m_knownChanged & m_knownChangedForce) != 0) | 770 | if ((m_knownChanged & m_knownChangedForce) != 0) |
771 | ControllingPrim.AddForce((Vector3)m_knownForce, false /*pushForce*/, true /*inTaintTime*/); | 771 | ControllingPrim.AddForce(false /* inTaintTime */, (Vector3)m_knownForce); |
772 | 772 | ||
773 | if ((m_knownChanged & m_knownChangedForceImpulse) != 0) | 773 | if ((m_knownChanged & m_knownChangedForceImpulse) != 0) |
774 | ControllingPrim.AddForceImpulse((Vector3)m_knownForceImpulse, false /*pushforce*/, true /*inTaintTime*/); | 774 | ControllingPrim.AddForceImpulse((Vector3)m_knownForceImpulse, false /*pushforce*/, true /*inTaintTime*/); |
@@ -784,7 +784,7 @@ namespace OpenSim.Region.PhysicsModule.BulletS | |||
784 | 784 | ||
785 | if ((m_knownChanged & m_knownChangedRotationalForce) != 0) | 785 | if ((m_knownChanged & m_knownChangedRotationalForce) != 0) |
786 | { | 786 | { |
787 | ControllingPrim.AddAngularForce((Vector3)m_knownRotationalForce, false /*pushForce*/, true /*inTaintTime*/); | 787 | ControllingPrim.AddAngularForce(true /* inTaintTime */, (Vector3)m_knownRotationalForce); |
788 | } | 788 | } |
789 | 789 | ||
790 | // If we set one of the values (ie, the physics engine didn't do it) we must force | 790 | // If we set one of the values (ie, the physics engine didn't do it) we must force |