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

Manage Angular Velocity during llLookAt() rotation of physical objects

inv-download
dahlia 2015-02-05 23:13:06 -08:00
parent ee810a2cb5
commit 3b7c3378f1
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -4881,8 +4881,10 @@ namespace OpenSim.Region.Framework.Scenes
{ {
if (APIDTarget != Quaternion.Identity) if (APIDTarget != Quaternion.Identity)
{ {
if (m_APIDIterations <= 1) if (m_APIDIterations <= 1)
{ {
AngularVelocity = Vector3.Zero;
UpdateRotation(APIDTarget); UpdateRotation(APIDTarget);
APIDTarget = Quaternion.Identity; APIDTarget = Quaternion.Identity;
return; return;
@ -4890,7 +4892,15 @@ namespace OpenSim.Region.Framework.Scenes
Quaternion rot = Quaternion.Slerp(RotationOffset,APIDTarget,1.0f/(float)m_APIDIterations); Quaternion rot = Quaternion.Slerp(RotationOffset,APIDTarget,1.0f/(float)m_APIDIterations);
rot.Normalize(); rot.Normalize();
UpdateRotation(rot);
Quaternion dR = rot / RotationOffset;
Vector3 axis;
float angle;
dR.GetAxisAngle(out axis, out angle);
axis *= RotationOffset;
axis.Normalize();
axis *= angle / 11; // simulator update frequency is 10-11 Hz
AngularVelocity = axis;
m_APIDIterations--; m_APIDIterations--;