aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/UbitOdePlugin/ODEDynamics.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/ODEDynamics.cs9
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEDynamics.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEDynamics.cs
index e27be1e..e900c02 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/ODEDynamics.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEDynamics.cs
@@ -137,6 +137,7 @@ namespace OpenSim.Region.Physics.OdePlugin
137 float m_amdampY; 137 float m_amdampY;
138 float m_amdampZ; 138 float m_amdampZ;
139 139
140
140 public float FrictionFactor 141 public float FrictionFactor
141 { 142 {
142 get 143 get
@@ -145,6 +146,7 @@ namespace OpenSim.Region.Physics.OdePlugin
145 } 146 }
146 } 147 }
147 148
149
148 public ODEDynamics(OdePrim rootp) 150 public ODEDynamics(OdePrim rootp)
149 { 151 {
150 rootPrim = rootp; 152 rootPrim = rootp;
@@ -345,7 +347,7 @@ namespace OpenSim.Region.Physics.OdePlugin
345 m_lmDecay = 1.0f - 1.0f / m_linearMotorDecayTimescale; 347 m_lmDecay = 1.0f - 1.0f / m_linearMotorDecayTimescale;
346 m_lmEfect = 1.0f; // turn it on 348 m_lmEfect = 1.0f; // turn it on
347 349
348 m_ffactor = 0.01f; 350 m_ffactor = 0.0f;
349 if (rootPrim.Body != IntPtr.Zero && !d.BodyIsEnabled(rootPrim.Body) 351 if (rootPrim.Body != IntPtr.Zero && !d.BodyIsEnabled(rootPrim.Body)
350 && !rootPrim.m_isSelected && !rootPrim.m_disabled) 352 && !rootPrim.m_isSelected && !rootPrim.m_disabled)
351 d.BodyEnable(rootPrim.Body); 353 d.BodyEnable(rootPrim.Body);
@@ -401,7 +403,7 @@ namespace OpenSim.Region.Physics.OdePlugin
401 m_lmEfect = 1.0f; // turn it on 403 m_lmEfect = 1.0f; // turn it on
402 m_lmDecay = 1.0f - 1.0f / m_linearMotorDecayTimescale; 404 m_lmDecay = 1.0f - 1.0f / m_linearMotorDecayTimescale;
403 405
404 m_ffactor = 0.01f; 406 m_ffactor = 0.0f;
405 if (rootPrim.Body != IntPtr.Zero && !d.BodyIsEnabled(rootPrim.Body) 407 if (rootPrim.Body != IntPtr.Zero && !d.BodyIsEnabled(rootPrim.Body)
406 && !rootPrim.m_isSelected && !rootPrim.m_disabled) 408 && !rootPrim.m_isSelected && !rootPrim.m_disabled)
407 d.BodyEnable(rootPrim.Body); 409 d.BodyEnable(rootPrim.Body);
@@ -805,7 +807,8 @@ namespace OpenSim.Region.Physics.OdePlugin
805 } 807 }
806 808
807 m_lmEfect *= m_lmDecay; 809 m_lmEfect *= m_lmDecay;
808 m_ffactor = 0.01f + 1e-4f * curVel.LengthSquared(); 810// m_ffactor = 0.01f + 1e-4f * curVel.LengthSquared();
811 m_ffactor = 0.0f;
809 } 812 }
810 else 813 else
811 { 814 {