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

change avatar standup code

avinationmerge
UbitUmarov 2014-07-20 16:03:05 +01:00
parent a5fcc0c0c0
commit d6f56a4f99
1 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1881,6 +1881,7 @@ namespace OpenSim.Region.Framework.Scenes
// (flags & AgentManager.ControlFlags.AGENT_CONTROL_YAW_NEG) != 0) // (flags & AgentManager.ControlFlags.AGENT_CONTROL_YAW_NEG) != 0)
// m_updateCount = UPDATE_COUNT; // m_updateCount = UPDATE_COUNT;
if ((flags & AgentManager.ControlFlags.AGENT_CONTROL_STAND_UP) != 0) if ((flags & AgentManager.ControlFlags.AGENT_CONTROL_STAND_UP) != 0)
{ {
StandUp(); StandUp();
@ -1950,9 +1951,7 @@ namespace OpenSim.Region.Framework.Scenes
if (AllowMovement && !SitGround) if (AllowMovement && !SitGround)
{ {
// m_log.DebugFormat("[SCENE PRESENCE]: Initial body rotation {0} for {1}", agentData.BodyRotation, Name); // m_log.DebugFormat("[SCENE PRESENCE]: Initial body rotation {0} for {1}", agentData.BodyRotation, Name);
bool update_rotation = false; bool update_rotation = false;
if (agentData.BodyRotation != Rotation) if (agentData.BodyRotation != Rotation)
{ {
Rotation = agentData.BodyRotation; Rotation = agentData.BodyRotation;
@ -2524,49 +2523,46 @@ namespace OpenSim.Region.Framework.Scenes
} }
part.ParentGroup.DeleteAvatar(UUID); part.ParentGroup.DeleteAvatar(UUID);
Vector3 sitPartWorldPosition = part.GetWorldPosition();
Quaternion standRotation = part.ParentGroup.RootPart.RotationOffset;
Vector3 sitPartWorldPosition = part.ParentGroup.AbsolutePosition + m_pos * standRotation;
ControllingClient.SendClearFollowCamProperties(part.ParentUUID); ControllingClient.SendClearFollowCamProperties(part.ParentUUID);
ParentID = 0; ParentID = 0;
ParentPart = null; ParentPart = null;
Quaternion standRotation;
if (part.SitTargetAvatar == UUID) if (part.SitTargetAvatar == UUID)
standRotation = standRotation * part.SitTargetOrientation;
else
standRotation = part.GetWorldRotation() * m_bodyRot;
m_bodyRot = standRotation;
Quaternion standRotationZ = new Quaternion(0,0,standRotation.Z,standRotation.W);
float t = standRotationZ.W * standRotationZ.W + standRotationZ.Z * standRotationZ.Z;
if (t > 0)
{ {
standRotation = part.GetWorldRotation(); t = 1.0f / (float)Math.Sqrt(t);
standRotationZ.W *= t;
if (!part.IsRoot) standRotationZ.Z *= t;
standRotation = standRotation * part.SitTargetOrientation;
// standRotation = part.RotationOffset * part.SitTargetOrientation;
// else
// standRotation = part.SitTargetOrientation;
} }
else else
{ {
standRotation = Rotation; standRotationZ.W = 1.0f;
standRotationZ.Z = 0f;
} }
//Vector3 standPos = ParentPosition + new Vector3(0.0f, 0.0f, 2.0f * m_sitAvatarHeight); Vector3 adjustmentForSitPose = new Vector3(0.75f, 0, m_sitAvatarHeight + .3f) * standRotationZ;
//Vector3 standPos = ParentPosition;
// Vector3 standPositionAdjustment Vector3 standPos = sitPartWorldPosition + adjustmentForSitPose;
// = part.SitTargetPosition + new Vector3(0.5f, 0f, m_sitAvatarHeight / 2f);
Vector3 adjustmentForSitPosition = part.SitTargetPosition * part.GetWorldRotation();
// XXX: This is based on the physics capsule sizes. Need to find a better way to read this rather than
// hardcoding here.
Vector3 adjustmentForSitPose = new Vector3(0.74f, 0f, 0f) * standRotation;
Vector3 standPos = sitPartWorldPosition + adjustmentForSitPosition + adjustmentForSitPose;
// m_log.DebugFormat( // m_log.DebugFormat(
// "[SCENE PRESENCE]: Setting stand to pos {0}, (adjustmentForSitPosition {1}, adjustmentForSitPose {2}) rotation {3} for {4} in {5}", // "[SCENE PRESENCE]: Setting stand to pos {0}, (adjustmentForSitPosition {1}, adjustmentForSitPose {2}) rotation {3} for {4} in {5}",
// standPos, adjustmentForSitPosition, adjustmentForSitPose, standRotation, Name, Scene.Name); // standPos, adjustmentForSitPosition, adjustmentForSitPose, standRotation, Name, Scene.Name);
Rotation = standRotation; m_pos = standPos;
AbsolutePosition = standPos;
} }
// We need to wait until we have calculated proper stand positions before sitting up the physical // We need to wait until we have calculated proper stand positions before sitting up the physical
@ -2824,8 +2820,7 @@ namespace OpenSim.Region.Framework.Scenes
Vector3 cameraEyeOffset = part.GetCameraEyeOffset(); Vector3 cameraEyeOffset = part.GetCameraEyeOffset();
bool forceMouselook = part.GetForceMouselook(); bool forceMouselook = part.GetForceMouselook();
Rotation = Orientation; m_bodyRot = Orientation;
m_pos = offset;
if (!part.IsRoot) if (!part.IsRoot)
{ {
@ -2834,6 +2829,8 @@ namespace OpenSim.Region.Framework.Scenes
offset += part.OffsetPosition; offset += part.OffsetPosition;
} }
m_pos = offset;
ControllingClient.SendSitResponse( ControllingClient.SendSitResponse(
part.ParentGroup.UUID, offset, Orientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook); part.ParentGroup.UUID, offset, Orientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook);