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

Adjust avatar sit positioning on a target to pretty much exactly match that of the LL grid. 

This uses an offset of 0.05 on the up vector of the sit orientation, after extensive analysis on
http://opensimulator.org/mantis/view.php?id=7096 and https://wiki.secondlife.com/wiki/Talk:LlSitTarget
This supersedes the previous adjustment in 5b73b9c4 which had been wrongly applied.
The maximum change is about 0.1 with a maximum height avatar.
This patch is all Aleric's work - I am applying manually in order to add these additional notes
0.8.0.3
Justin Clark-Casey (justincc) 2014-04-23 19:19:09 +01:00
parent b01e73cf27
commit 328bc3b76e
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -2941,28 +2941,40 @@ namespace OpenSim.Region.Framework.Scenes
//Quaternion result = (sitTargetOrient * vq) * nq; //Quaternion result = (sitTargetOrient * vq) * nq;
double x, y, z, m; double x, y, z, m1, m2;
Quaternion r = sitTargetOrient; Quaternion r = sitTargetOrient;
m = r.X * r.X + r.Y * r.Y + r.Z * r.Z + r.W * r.W; m1 = r.X * r.X + r.Y * r.Y;
m2 = r.Z * r.Z + r.W * r.W;
if (Math.Abs(1.0 - m) > 0.000001)
{
m = 1.0 / Math.Sqrt(m);
r.X *= (float)m;
r.Y *= (float)m;
r.Z *= (float)m;
r.W *= (float)m;
}
// Rotate the vector <0, 0, 1>
x = 2 * (r.X * r.Z + r.Y * r.W); x = 2 * (r.X * r.Z + r.Y * r.W);
y = 2 * (-r.X * r.W + r.Y * r.Z); y = 2 * (-r.X * r.W + r.Y * r.Z);
z = -r.X * r.X - r.Y * r.Y + r.Z * r.Z + r.W * r.W; z = m2 - m1;
// Set m to be the square of the norm of r.
double m = m1 + m2;
// This constant is emperically determined to be what is used in SL.
// See also http://opensimulator.org/mantis/view.php?id=7096
double offset = 0.05;
// Normally m will be ~ 1, but if someone passed a handcrafted quaternion
// to llSitTarget with values so small that squaring them is rounded off
// to zero, then m could be zero. The result of this floating point
// round off error (causing us to skip this impossible normalization)
// is only 5 cm.
if (m > 0.000001)
{
offset /= m;
}
Vector3 up = new Vector3((float)x, (float)y, (float)z); Vector3 up = new Vector3((float)x, (float)y, (float)z);
Vector3 sitOffset = up * Appearance.AvatarHeight * 0.02638f; Vector3 sitOffset = up * (float)offset;
Vector3 newPos = sitTargetPos + sitOffset + SIT_TARGET_ADJUSTMENT; // sitOffset is in Avatar Center coordinates: from origin to 'sitTargetPos + SIT_TARGET_ADJUSTMENT'.
// So, we need to _substract_ it to get to the origin of the Avatar Center.
Vector3 newPos = sitTargetPos + SIT_TARGET_ADJUSTMENT - sitOffset;
Quaternion newRot; Quaternion newRot;
if (part.IsRoot) if (part.IsRoot)