From 8c2061029331e323b5c1c0414bbda417cb6c4674 Mon Sep 17 00:00:00 2001 From: Kitto Flora Date: Tue, 2 Feb 2010 13:28:42 -0500 Subject: AngMotor update 1 --- OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs') 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"); { get { - Vector3 pv = Vector3.Zero; +/* Vector3 pv = Vector3.Zero; if (_zeroFlag) return pv; m_lastUpdateSent = false; if (m_rotationalVelocity.ApproxEquals(pv, 0.2f)) return pv; - +*/ return m_rotationalVelocity; } set @@ -2827,14 +2827,15 @@ Console.WriteLine(" JointCreateFixed"); _acceleration = new Vector3(_velocity.X - m_lastVelocity.X / 0.1f, _velocity.Y - m_lastVelocity.Y / 0.1f, _velocity.Z - m_lastVelocity.Z / 0.1f); //m_log.Info("[PHYSICS]: V1: " + _velocity + " V2: " + m_lastVelocity + " Acceleration: " + _acceleration.ToString()); - if (_velocity.ApproxEquals(pv, 0.5f)) - { - m_rotationalVelocity = pv; - } - else - { +// if (_velocity.ApproxEquals(pv, 0.5f)) ???? Disregard rotational vel if lin vel is < 0.5 ????? +// { +// m_rotationalVelocity = pv;/ + +// } +// else +// { m_rotationalVelocity = new Vector3(rotvel.X, rotvel.Y, rotvel.Z); - } +// } //m_log.Debug("ODE: " + m_rotationalVelocity.ToString()); _orientation.X = ori.X; -- cgit v1.1