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

Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

avinationmerge
ubit 2012-07-16 02:54:08 +02:00
parent d3d877ceca cbaf59e086
commit 2eab788dcd
1 changed files with 52 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8000,6 +8000,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
//This is a special version of SetPrimParams to deal with avatars which are sat on the linkset. //This is a special version of SetPrimParams to deal with avatars which are sat on the linkset.
int idx = 0; int idx = 0;
SceneObjectPart sitpart = World.GetSceneObjectPart(av.ParentID); // betting this will be used
bool positionChanged = false; bool positionChanged = false;
Vector3 finalPos = Vector3.Zero; Vector3 finalPos = Vector3.Zero;
@ -8014,60 +8015,81 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
switch (code) switch (code)
{ {
// a avatar is a child
case (int)ScriptBaseClass.PRIM_POSITION: case (int)ScriptBaseClass.PRIM_POSITION:
case (int)ScriptBaseClass.PRIM_POS_LOCAL: case (int)ScriptBaseClass.PRIM_POS_LOCAL:
{ {
if (remain < 1) if (remain < 1)
return; return;
LSL_Vector v; LSL_Vector v;
v = rules.GetVector3Item(idx++); v = rules.GetVector3Item(idx++);
SceneObjectPart part = World.GetSceneObjectPart(av.ParentID); if (sitpart == null)
if (part == null)
break; break;
LSL_Rotation localRot = ScriptBaseClass.ZERO_ROTATION; Vector3 pos = new Vector3((float)v.x, (float)v.y, (float)v.z); // requested absolute position
LSL_Vector localPos = ScriptBaseClass.ZERO_VECTOR;
if (llGetLinkNumber() > 1) if (sitpart != sitpart.ParentGroup.RootPart)
{ {
localRot = llGetLocalRot(); pos -= sitpart.OffsetPosition; // remove sit part offset
localPos = llGetLocalPos(); Quaternion rot = sitpart.RotationOffset;
pos *= Quaternion.Conjugate(rot); // removed sit part rotation
} }
Vector3 sitOffset = (Zrot(av.Rotation)) * (av.Appearance.AvatarHeight * 0.02638f * 2.0f);
pos += sitOffset;
v -= localPos; finalPos = pos;
v /= localRot; positionChanged = true;
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;
av.OffsetPosition = new Vector3((float)v.x, (float)v.y, (float)v.z);
av.SendAvatarDataToAllAgents();
} }
break; break;
case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
case (int)ScriptBaseClass.PRIM_ROTATION: case (int)ScriptBaseClass.PRIM_ROTATION:
{ {
if (remain < 1) if (remain < 1)
return; return;
LSL_Rotation localRot = ScriptBaseClass.ZERO_ROTATION; if (sitpart == null)
LSL_Vector localPos = ScriptBaseClass.ZERO_VECTOR; break;
if (llGetLinkNumber() > 1) LSL_Rotation r = rules.GetQuaternionItem(idx++);
Quaternion rot = new Quaternion((float)r.x, (float)r.y, (float)r.z, (float)r.s); // requested world rotation
SceneObjectGroup sitgrp = sitpart.ParentGroup;
if (sitgrp != null)
{ {
localRot = llGetLocalRot(); // need to replicate SL bug
localPos = llGetLocalPos(); rot = sitgrp.RootPart.RotationOffset * rot;
} if (sitgrp.RootPart != sitpart)
{
Quaternion srot = sitpart.RotationOffset;
rot = Quaternion.Conjugate(srot) * rot; // removed sit part offset rotation
}
LSL_Rotation r; av.Rotation = rot;
r = rules.GetQuaternionItem(idx++); // av.SendAvatarDataToAllAgents();
r = r * llGetRootRotation() / localRot; av.SendTerseUpdateToAllClients();
av.Rotation = new Quaternion((float)r.x, (float)r.y, (float)r.z, (float)r.s); }
av.SendAvatarDataToAllAgents(); }
break;
case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
{
if (remain < 1)
return;
if (sitpart == null)
break;
LSL_Rotation r = rules.GetQuaternionItem(idx++);
Quaternion rot = new Quaternion((float)r.x, (float)r.y, (float)r.z, (float)r.s); // requested offset rotation
if (sitpart != sitpart.ParentGroup.RootPart)
{
Quaternion srot = sitpart.RotationOffset;
rot = Quaternion.Conjugate(srot) * rot; // remove sit part offset rotation
}
av.Rotation = rot;
// av.SendAvatarDataToAllAgents();
av.SendTerseUpdateToAllClients();
} }
break; break;