diff options
author | onefang | 2019-09-11 16:36:50 +1000 |
---|---|---|
committer | onefang | 2019-09-11 16:36:50 +1000 |
commit | 50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch) | |
tree | 52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Region/PhysicsModules/BulletS/BSDynamics.cs | |
parent | Renamed branch to SledjChisl. (diff) | |
parent | Bump to release flavour, build 0. (diff) | |
download | opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2 opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz |
Merge branch 'SledjChisl'
Diffstat (limited to 'OpenSim/Region/PhysicsModules/BulletS/BSDynamics.cs')
-rw-r--r-- | OpenSim/Region/PhysicsModules/BulletS/BSDynamics.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSDynamics.cs b/OpenSim/Region/PhysicsModules/BulletS/BSDynamics.cs index 0fc5577..c4ccdbe 100644 --- a/OpenSim/Region/PhysicsModules/BulletS/BSDynamics.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSDynamics.cs | |||
@@ -125,8 +125,8 @@ namespace OpenSim.Region.PhysicsModule.BulletS | |||
125 | 125 | ||
126 | // Just some recomputed constants: | 126 | // Just some recomputed constants: |
127 | #pragma warning disable 414 | 127 | #pragma warning disable 414 |
128 | static readonly float TwoPI = ((float)Math.PI) * 2f; | 128 | static readonly float TwoPI = ((float)Math.PI) * 2f; |
129 | static readonly float FourPI = ((float)Math.PI) * 4f; | 129 | static readonly float FourPI = ((float)Math.PI) * 4f; |
130 | static readonly float PIOverFour = ((float)Math.PI) / 4f; | 130 | static readonly float PIOverFour = ((float)Math.PI) / 4f; |
131 | static readonly float PIOverTwo = ((float)Math.PI) / 2f; | 131 | static readonly float PIOverTwo = ((float)Math.PI) / 2f; |
132 | #pragma warning restore 414 | 132 | #pragma warning restore 414 |
@@ -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 |
@@ -1595,7 +1595,7 @@ namespace OpenSim.Region.PhysicsModule.BulletS | |||
1595 | // in that direction. | 1595 | // in that direction. |
1596 | // TODO: implement reference frame. | 1596 | // TODO: implement reference frame. |
1597 | public void ComputeAngularDeflection() | 1597 | public void ComputeAngularDeflection() |
1598 | { | 1598 | { |
1599 | 1599 | ||
1600 | if (BSParam.VehicleEnableAngularDeflection && m_angularDeflectionEfficiency != 0 && VehicleForwardSpeed > 0.2) | 1600 | if (BSParam.VehicleEnableAngularDeflection && m_angularDeflectionEfficiency != 0 && VehicleForwardSpeed > 0.2) |
1601 | { | 1601 | { |