OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Motor angular decay fix.

avinationmerge
Kitto Flora 2010-02-03 16:20:13 -05:00
parent fc1ac25935
commit 48134af616
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/Physics/ChOdePlugin/ODEDynamics.cs
View File

@ -646,12 +646,15 @@ namespace OpenSim.Region.Physics.OdePlugin
//if(frcount == 0) Console.WriteLine("V0 = {0}", angObjectVel); //if(frcount == 0) Console.WriteLine("V0 = {0}", angObjectVel);
// Vector3 FrAaccel = m_lastAngularVelocity - angObjectVel; // Vector3 FrAaccel = m_lastAngularVelocity - angObjectVel;
// Vector3 initavel = angObjectVel; // Vector3 initavel = angObjectVel;
// Decay Angular Motor // Decay Angular Motor 1. In SL this also depends on attack rate! decay ~= 23/Attack.
float atk_decayfactor = 23.0f / (m_angularMotorTimescale * pTimestep);
m_angularMotorDVel -= m_angularMotorDVel / atk_decayfactor;
// Decay Angular Motor 2.
if (m_angularMotorDecayTimescale < 300.0f) if (m_angularMotorDecayTimescale < 300.0f)
{ {
float decayfactor = m_angularMotorDecayTimescale/pTimestep; float decayfactor = m_angularMotorDecayTimescale/pTimestep; // df = Dec / pts
Vector3 decayAmount = (m_angularMotorDVel/decayfactor); Vector3 decayAmount = (m_angularMotorDVel/decayfactor); // v-da = v-Dvel / df = v-Dvel * pts / Dec
m_angularMotorDVel -= decayAmount; m_angularMotorDVel -= decayAmount; // v-Dvel = v-Dvel - (v-Dvel / df = v-Dvel * pts / Dec)
if (m_angularMotorDVel.ApproxEquals(Vector3.Zero, 0.01f)) if (m_angularMotorDVel.ApproxEquals(Vector3.Zero, 0.01f))
{ {