From 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb Mon Sep 17 00:00:00 2001 From: onefang Date: Sun, 19 May 2019 21:24:15 +1000 Subject: Dump OpenSim 0.9.0.1 into it's own branch. --- OpenSim/Region/PhysicsModules/BulletS/BSDynamics.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'OpenSim/Region/PhysicsModules/BulletS/BSDynamics.cs') 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 // Just some recomputed constants: #pragma warning disable 414 - static readonly float TwoPI = ((float)Math.PI) * 2f; - static readonly float FourPI = ((float)Math.PI) * 4f; + static readonly float TwoPI = ((float)Math.PI) * 2f; + static readonly float FourPI = ((float)Math.PI) * 4f; static readonly float PIOverFour = ((float)Math.PI) / 4f; static readonly float PIOverTwo = ((float)Math.PI) / 2f; #pragma warning restore 414 @@ -768,7 +768,7 @@ namespace OpenSim.Region.PhysicsModule.BulletS } if ((m_knownChanged & m_knownChangedForce) != 0) - ControllingPrim.AddForce((Vector3)m_knownForce, false /*pushForce*/, true /*inTaintTime*/); + ControllingPrim.AddForce(false /* inTaintTime */, (Vector3)m_knownForce); if ((m_knownChanged & m_knownChangedForceImpulse) != 0) ControllingPrim.AddForceImpulse((Vector3)m_knownForceImpulse, false /*pushforce*/, true /*inTaintTime*/); @@ -784,7 +784,7 @@ namespace OpenSim.Region.PhysicsModule.BulletS if ((m_knownChanged & m_knownChangedRotationalForce) != 0) { - ControllingPrim.AddAngularForce((Vector3)m_knownRotationalForce, false /*pushForce*/, true /*inTaintTime*/); + ControllingPrim.AddAngularForce(true /* inTaintTime */, (Vector3)m_knownRotationalForce); } // 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 // in that direction. // TODO: implement reference frame. public void ComputeAngularDeflection() - { + { if (BSParam.VehicleEnableAngularDeflection && m_angularDeflectionEfficiency != 0 && VehicleForwardSpeed > 0.2) { -- cgit v1.1