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

change llLookAt math to master cleaner solution, assuming lAxis2rot does work

LSLKeyTest
UbitUmarov 2015-11-29 14:36:09 +00:00
parent ca026ac735
commit 302d28625d
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -3550,19 +3550,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
// Get the normalized vector to the target // Get the normalized vector to the target
LSL_Vector d1 = llVecNorm(target - llGetPos()); LSL_Vector from = llGetPos();
// Get the bearing (yaw) // normalized direction to target
LSL_Vector a1 = new LSL_Vector(0,0,0); LSL_Vector dir = llVecNorm(target - from);
a1.z = llAtan2(d1.y, d1.x);
// Get the elevation (pitch) // use vertical to help compute left axis
LSL_Vector a2 = new LSL_Vector(0,0,0); // LSL_Vector up = new LSL_Vector(0.0, 0.0, 1.0);
a2.y= -llAtan2(d1.z, llSqrt((d1.x * d1.x) + (d1.y * d1.y))); // find normalized left axis parallel to horizon
// LSL_Vector left = llVecNorm(LSL_Vector.Cross(up, dir));
LSL_Rotation r1 = llEuler2Rot(a1); LSL_Vector left = new LSL_Vector(-dir.y, dir.x, 0.0f);
LSL_Rotation r2 = llEuler2Rot(a2); left = llVecNorm(left);
LSL_Rotation r3 = new LSL_Rotation(0.000000, 0.707107, 0.000000, 0.707107); // make up orthogonal to left and dir
LSL_Vector up = LSL_Vector.Cross(dir, left);
// compute rotation based on orthogonal axes
// and rotate so Z points to target with X below horizont
LSL_Rotation rot = new LSL_Rotation(0.0, 0.707107, 0.0, 0.707107) * llAxes2Rot(dir, left, up);
if (m_host.PhysActor == null || !m_host.PhysActor.IsPhysical) if (m_host.PhysActor == null || !m_host.PhysActor.IsPhysical)
{ {
@ -3570,17 +3575,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (strength <= 0.0 || damping <= 0.0) if (strength <= 0.0 || damping <= 0.0)
return; return;
llSetRot(r3 * r2 * r1); llSetRot(rot);
} }
else else
{ {
if (strength == 0) if (strength == 0)
{ {
llSetRot(r3 * r2 * r1); llSetRot(rot);
return; return;
} }
m_host.StartLookAt((Quaternion)(r3 * r2 * r1), (float)strength, (float)damping); m_host.StartLookAt(rot, (float)strength, (float)damping);
} }
} }