From b6dda231f2d6be6ac7684048a11f1f0516ed3067 Mon Sep 17 00:00:00 2001
From: Kitto Flora
Date: Fri, 4 Feb 2011 17:31:52 +0000
Subject: Corrections for Avatar Auto-pilot target; add llStopMoveToTarget()
for Avatar-attached.
---
.../Region/Framework/Scenes/SceneObjectGroup.cs | 13 +++++-
OpenSim/Region/Framework/Scenes/ScenePresence.cs | 47 ++++++++++++++++++++--
2 files changed, 55 insertions(+), 5 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 6e0fc43..4cbf3e1 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1912,6 +1912,7 @@ namespace OpenSim.Region.Framework.Scenes
return Vector3.Zero;
}
+ // This is used by both Double-Click Auto-Pilot and llMoveToTarget() in an attached object
public void moveToTarget(Vector3 target, float tau)
{
SceneObjectPart rootpart = m_rootPart;
@@ -1951,9 +1952,17 @@ namespace OpenSim.Region.Framework.Scenes
SceneObjectPart rootpart = m_rootPart;
if (rootpart != null)
{
- if (rootpart.PhysActor != null)
+ if (IsAttachment)
{
- rootpart.PhysActor.PIDActive = false;
+ ScenePresence avatar = m_scene.GetScenePresence(rootpart.AttachedAvatar);
+ if (avatar != null) avatar.StopMoveToPosition();
+ }
+ else
+ {
+ if (rootpart.PhysActor != null)
+ {
+ rootpart.PhysActor.PIDActive = false;
+ }
}
}
}
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index b54d1b8..b87275c 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1605,8 +1605,41 @@ namespace OpenSim.Region.Framework.Scenes
if (bAllowUpdateMoveToPosition && (m_moveToPositionInProgress && !m_autopilotMoving))
{
+/*
+ bool twoD = false;
+ bool there = false;
+ if (Animator != null)
+ {
+ switch (Animator.CurrentMovementAnimation)
+ {
+ case "STAND":
+ case "WALK":
+ case "RUN":
+ case "CROUCH":
+ case "CROUCHWALK":
+ {
+ twoD = true;
+ }
+ break;
+ }
+ }
+
+ if (twoD)
+ {
+*/
+ Vector3 abspos = new Vector3(AbsolutePosition.X, AbsolutePosition.Y, 0.0f);
+ Vector3 tgt = new Vector3(m_moveToPositionTarget.X, m_moveToPositionTarget.Y, 0.0f);
+/* if (Util.GetDistanceTo(abspos, tgt) <= 0.5f) there = true;
+ }
+ else
+ {
+ if (Util.GetDistanceTo(AbsolutePosition, m_moveToPositionTarget) <= 0.5f) there = true;
+ }
+*/
//Check the error term of the current position in relation to the target position
- if (Util.GetDistanceTo(AbsolutePosition, m_moveToPositionTarget) <= 0.5f)
+// if (Util.GetDistanceTo(AbsolutePosition, m_moveToPositionTarget) <= 0.5f)
+// if (there)
+ if (Util.GetDistanceTo(abspos, tgt) <= 0.5f)
{
// we are close enough to the target
m_moveToPositionTarget = Vector3.Zero;
@@ -1623,7 +1656,8 @@ namespace OpenSim.Region.Framework.Scenes
// unknown forces are acting on the avatar and we need to adaptively respond
// to such forces, but the following simple approach seems to works fine.
Vector3 LocalVectorToTarget3D =
- (m_moveToPositionTarget - AbsolutePosition) // vector from cur. pos to target in global coords
+// (m_moveToPositionTarget - AbsolutePosition) // vector from cur. pos to target in global coords
+ (tgt - abspos)
* Matrix4.CreateFromQuaternion(Quaternion.Inverse(bodyRotation)); // change to avatar coords
// Ignore z component of vector
Vector3 LocalVectorToTarget2D = new Vector3((float)(LocalVectorToTarget3D.X), (float)(LocalVectorToTarget3D.Y), 0f);
@@ -1760,8 +1794,15 @@ namespace OpenSim.Region.Framework.Scenes
// }
}
+ public void StopMoveToPosition()
+ {
+ m_moveToPositionTarget = Vector3.Zero;
+ m_moveToPositionInProgress = false;
+ }
+
public void DoMoveToPosition(Object sender, string method, List<String> args)
{
+//Console.WriteLine("SP:DoMoveToPosition");
try
{
float locx = 0f;
@@ -1782,7 +1823,7 @@ namespace OpenSim.Region.Framework.Scenes
return;
}
m_moveToPositionInProgress = true;
- m_moveToPositionTarget = new Vector3(locx, locy, locz + (m_appearance.AvatarHeight / 2.0f));
+ m_moveToPositionTarget = new Vector3(locx, locy, locz);
}
catch (Exception ex)
{
--
cgit v1.1