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

Fix LSL portions of sit positioning

avinationmerge
Melanie Thielker 2014-07-20 23:54:06 +02:00
parent 719880a6ff
commit c37a88d4f1
1 changed files with 11 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13069,21 +13069,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
LSL_Vector v; LSL_Vector v;
v = rules.GetVector3Item(idx++); v = rules.GetVector3Item(idx++);
SceneObjectPart part = World.GetSceneObjectPart(av.ParentID);
if (part == null)
break;
LSL_Rotation localRot = ScriptBaseClass.ZERO_ROTATION;
LSL_Vector localPos = ScriptBaseClass.ZERO_VECTOR;
if (part.LinkNum > 1)
{
localRot = GetPartLocalRot(part);
localPos = GetPartLocalPos(part);
}
v -= localPos;
v /= localRot;
LSL_Vector sitOffset = (llRot2Up(new LSL_Rotation(av.Rotation.X, av.Rotation.Y, av.Rotation.Z, av.Rotation.W)) * av.Appearance.AvatarHeight * 0.02638f); LSL_Vector sitOffset = (llRot2Up(new LSL_Rotation(av.Rotation.X, av.Rotation.Y, av.Rotation.Z, av.Rotation.W)) * av.Appearance.AvatarHeight * 0.02638f);
v = v + 2 * sitOffset; v = v + 2 * sitOffset;
@ -13103,18 +13088,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
LSL_Rotation r; LSL_Rotation r;
r = rules.GetQuaternionItem(idx++); r = rules.GetQuaternionItem(idx++);
SceneObjectPart part = World.GetSceneObjectPart(av.ParentID); av.Rotation = r * llGetRootRotation();
if (part == null)
break;
LSL_Rotation localRot = ScriptBaseClass.ZERO_ROTATION;
LSL_Vector localPos = ScriptBaseClass.ZERO_VECTOR;
if (part.LinkNum > 1)
localRot = GetPartLocalRot(part);
r = r * llGetRootRotation() / localRot;
av.Rotation = new Quaternion((float)r.x, (float)r.y, (float)r.z, (float)r.s);
av.SendAvatarDataToAllAgents(); av.SendAvatarDataToAllAgents();
} }
break; break;
@ -13268,8 +13242,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
Vector3 sitOffset = (Zrot(avatar.Rotation)) * (avatar.Appearance.AvatarHeight * 0.02638f *2.0f); Vector3 sitOffset = (Zrot(avatar.Rotation)) * (avatar.Appearance.AvatarHeight * 0.02638f *2.0f);
pos -= sitOffset; pos -= sitOffset;
if( sitPart != null) //if( sitPart != null)
pos = sitPart.GetWorldPosition() + pos * sitPart.GetWorldRotation(); // pos = sitPart.GetWorldPosition() + pos * sitPart.GetWorldRotation();
res.Add(new LSL_Vector(pos.X,pos.Y,pos.Z)); res.Add(new LSL_Vector(pos.X,pos.Y,pos.Z));
break; break;
@ -13283,13 +13257,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
break; break;
case (int)ScriptBaseClass.PRIM_ROTATION: case (int)ScriptBaseClass.PRIM_ROTATION:
Quaternion rot = avatar.Rotation; //Quaternion rot = avatar.Rotation / llGetRootRotation();
if (sitPart != null) LSL_Rotation rot = new LSL_Rotation(avatar.Rotation.X, avatar.Rotation.Y, avatar.Rotation.Z, avatar.Rotation.W) / llGetRootRotation();
{ //if (sitPart != null)
rot = sitPart.GetWorldRotation() * rot; // apply sit part world rotation //{
} // rot = sitPart.GetWorldRotation() * rot; // apply sit part world rotation
//}
res.Add(new LSL_Rotation (rot.X, rot.Y, rot.Z, rot.W)); //res.Add(new LSL_Rotation (rot.X, rot.Y, rot.Z, rot.W));
res.Add(rot);
break; break;
case (int)ScriptBaseClass.PRIM_TYPE: case (int)ScriptBaseClass.PRIM_TYPE: