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

llLookAt() and llRotLookAt(): all orientation updates now done via angular velocity manipulation. Also correct some orientation glitches during interpolation.

inv-download
dahlia 2015-02-06 22:36:26 -08:00
parent 3b7c3378f1
commit 506e62f815
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4881,28 +4881,39 @@ namespace OpenSim.Region.Framework.Scenes
{ {
if (APIDTarget != Quaternion.Identity) if (APIDTarget != Quaternion.Identity)
{ {
PhysicsActor pa = ParentGroup.RootPart.PhysActor;
if (m_APIDIterations <= 1) if (pa == null || !pa.IsPhysical)
{ {
AngularVelocity = Vector3.Zero; StopLookAt();
UpdateRotation(APIDTarget);
APIDTarget = Quaternion.Identity;
return; return;
} }
Quaternion rot = Quaternion.Slerp(RotationOffset,APIDTarget,1.0f/(float)m_APIDIterations); Quaternion currRot = GetWorldRotation();
rot.Normalize(); currRot.Normalize();
Quaternion dR = rot / RotationOffset; // difference between current orientation and desired orientation
Vector3 axis; Quaternion dR = new Quaternion(currRot.X, currRot.Y, currRot.Z, -currRot.W) * APIDTarget;
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--; // find axis of rotation to rotate to desired orientation
Vector3 axis = Vector3.UnitX;
float s = (float)Math.Sqrt(1.0f - dR.W * dR.W);
if (s >= 0.001)
{
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;
// set angular velocity to rotate to desired orientation
// with velocity proportional to strength and angle
// the factor of 10 seems to make rotation speed closer to LL implementation
AngularVelocity = axis * angle * APIDStrength * (float)Math.PI * 10.0f;
// This ensures that we'll check this object on the next iteration // This ensures that we'll check this object on the next iteration
ParentGroup.QueueForUpdateCheck(); ParentGroup.QueueForUpdateCheck();