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

SceneObjectPart.UpdateLookAt() now uses corrected libomv quaternion functions.

fsassets
dahlia 2015-06-10 01:26:38 -07:00
parent 6a6c5942fa
commit 58972f65ac
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4911,23 +4911,13 @@ namespace OpenSim.Region.Framework.Scenes
currRot.Normalize(); currRot.Normalize();
// difference between current orientation and desired orientation // difference between current orientation and desired orientation
Quaternion dR = new Quaternion(currRot.X, currRot.Y, currRot.Z, -currRot.W) * APIDTarget; Quaternion dR = currRot / APIDTarget;
// find axis of rotation to rotate to desired orientation // find axis and angle of rotation to rotate to desired orientation
Vector3 axis = Vector3.UnitX; Vector3 axis = Vector3.UnitX;
float s = (float)Math.Sqrt(1.0f - dR.W * dR.W); float angle;
if (s >= 0.001) dR.GetAxisAngle(out axis, out angle);
{ axis = axis * currRot;
float invS = 1.0f / s;
if (dR.W < 0) invS = -invS;
axis = new Vector3(dR.X * invS, dR.Y * invS, dR.Z * invS) * currRot;
axis.Normalize();
}
// angle between current and desired orientation
float angle = 2.0f * (float)Math.Acos(dR.W);
if (angle > Math.PI)
angle = 2.0f * (float)Math.PI - angle;
// clamp strength to avoid overshoot // clamp strength to avoid overshoot
float strength = 1.0f / APIDStrength; float strength = 1.0f / APIDStrength;