aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorRobert Adams2012-12-20 16:06:52 -0800
committerRobert Adams2012-12-20 16:06:52 -0800
commit9d2f569d600cad688ac7e06fcac7e94023b3600a (patch)
treefa3eb21fd3536e3512d8908627cc4f48c2449953
parentBulletSim: Check for unspecified TimeScale in BSVMotor and don't scale if not... (diff)
downloadopensim-SC_OLD-9d2f569d600cad688ac7e06fcac7e94023b3600a.zip
opensim-SC_OLD-9d2f569d600cad688ac7e06fcac7e94023b3600a.tar.gz
opensim-SC_OLD-9d2f569d600cad688ac7e06fcac7e94023b3600a.tar.bz2
opensim-SC_OLD-9d2f569d600cad688ac7e06fcac7e94023b3600a.tar.xz
BulletSim: fix incorrectly defined property changed flag.
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index c3d75ea..a5acd86 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -627,7 +627,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
627 private const int m_knownChangedRotationalForce = 1 << 5; 627 private const int m_knownChangedRotationalForce = 1 << 5;
628 private const int m_knownChangedTerrainHeight = 1 << 6; 628 private const int m_knownChangedTerrainHeight = 1 << 6;
629 private const int m_knownChangedWaterLevel = 1 << 7; 629 private const int m_knownChangedWaterLevel = 1 << 7;
630 private const int m_knownChangedForwardVelocity = 1 << 7; 630 private const int m_knownChangedForwardVelocity = 1 << 8;
631 631
632 private void ForgetKnownVehicleProperties() 632 private void ForgetKnownVehicleProperties()
633 { 633 {
@@ -860,13 +860,11 @@ namespace OpenSim.Region.Physics.BulletSPlugin
860 // ================================================================== 860 // ==================================================================
861 // Clamp high or low velocities 861 // Clamp high or low velocities
862 float newVelocityLengthSq = newVelocity.LengthSquared(); 862 float newVelocityLengthSq = newVelocity.LengthSquared();
863 // if (newVelocityLengthSq > 1e6f)
864 if (newVelocityLengthSq > 1000f) 863 if (newVelocityLengthSq > 1000f)
865 { 864 {
866 newVelocity /= newVelocity.Length(); 865 newVelocity /= newVelocity.Length();
867 newVelocity *= 1000f; 866 newVelocity *= 1000f;
868 } 867 }
869 // else if (newVelocityLengthSq < 1e-6f)
870 else if (newVelocityLengthSq < 0.001f) 868 else if (newVelocityLengthSq < 0.001f)
871 newVelocity = Vector3.Zero; 869 newVelocity = Vector3.Zero;
872 870