diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs index 29a3dd9..8502aef 100644 --- a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs | |||
@@ -2593,14 +2593,14 @@ Console.WriteLine(" JointCreateFixed"); | |||
2593 | { | 2593 | { |
2594 | get | 2594 | get |
2595 | { | 2595 | { |
2596 | Vector3 pv = Vector3.Zero; | 2596 | /* Vector3 pv = Vector3.Zero; |
2597 | if (_zeroFlag) | 2597 | if (_zeroFlag) |
2598 | return pv; | 2598 | return pv; |
2599 | m_lastUpdateSent = false; | 2599 | m_lastUpdateSent = false; |
2600 | 2600 | ||
2601 | if (m_rotationalVelocity.ApproxEquals(pv, 0.2f)) | 2601 | if (m_rotationalVelocity.ApproxEquals(pv, 0.2f)) |
2602 | return pv; | 2602 | return pv; |
2603 | 2603 | */ | |
2604 | return m_rotationalVelocity; | 2604 | return m_rotationalVelocity; |
2605 | } | 2605 | } |
2606 | set | 2606 | set |
@@ -2827,14 +2827,15 @@ Console.WriteLine(" JointCreateFixed"); | |||
2827 | _acceleration = new Vector3(_velocity.X - m_lastVelocity.X / 0.1f, _velocity.Y - m_lastVelocity.Y / 0.1f, _velocity.Z - m_lastVelocity.Z / 0.1f); | 2827 | _acceleration = new Vector3(_velocity.X - m_lastVelocity.X / 0.1f, _velocity.Y - m_lastVelocity.Y / 0.1f, _velocity.Z - m_lastVelocity.Z / 0.1f); |
2828 | //m_log.Info("[PHYSICS]: V1: " + _velocity + " V2: " + m_lastVelocity + " Acceleration: " + _acceleration.ToString()); | 2828 | //m_log.Info("[PHYSICS]: V1: " + _velocity + " V2: " + m_lastVelocity + " Acceleration: " + _acceleration.ToString()); |
2829 | 2829 | ||
2830 | if (_velocity.ApproxEquals(pv, 0.5f)) | 2830 | // if (_velocity.ApproxEquals(pv, 0.5f)) ???? Disregard rotational vel if lin vel is < 0.5 ????? |
2831 | { | 2831 | // { |
2832 | m_rotationalVelocity = pv; | 2832 | // m_rotationalVelocity = pv;/ |
2833 | } | 2833 | |
2834 | else | 2834 | // } |
2835 | { | 2835 | // else |
2836 | // { | ||
2836 | m_rotationalVelocity = new Vector3(rotvel.X, rotvel.Y, rotvel.Z); | 2837 | m_rotationalVelocity = new Vector3(rotvel.X, rotvel.Y, rotvel.Z); |
2837 | } | 2838 | // } |
2838 | 2839 | ||
2839 | //m_log.Debug("ODE: " + m_rotationalVelocity.ToString()); | 2840 | //m_log.Debug("ODE: " + m_rotationalVelocity.ToString()); |
2840 | _orientation.X = ori.X; | 2841 | _orientation.X = ori.X; |