diff options
author | Justin Clark-Casey (justincc) | 2011-08-03 23:40:05 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-08-03 23:40:05 +0100 |
commit | 31fb6b2d72081a7ab27199f57e6a40fc1e478bc2 (patch) | |
tree | 4e4160247f868de2202b5bc5a25d3342a542ead5 /OpenSim/Region/Framework | |
parent | rename NPC.Autopilot to NPC.MoveToTarget internally. Add method doc to INPCM... (diff) | |
download | opensim-SC_OLD-31fb6b2d72081a7ab27199f57e6a40fc1e478bc2.zip opensim-SC_OLD-31fb6b2d72081a7ab27199f57e6a40fc1e478bc2.tar.gz opensim-SC_OLD-31fb6b2d72081a7ab27199f57e6a40fc1e478bc2.tar.bz2 opensim-SC_OLD-31fb6b2d72081a7ab27199f57e6a40fc1e478bc2.tar.xz |
remove move to duck walk compensation - no longer required.
extends npc move to regression test to check stop after sufficient sim updates
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index f482974..6a3e79a 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1568,9 +1568,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
1568 | if (allowUpdate && (m_moveToPositionInProgress && !m_autopilotMoving)) | 1568 | if (allowUpdate && (m_moveToPositionInProgress && !m_autopilotMoving)) |
1569 | { | 1569 | { |
1570 | double distanceToTarget = Util.GetDistanceTo(AbsolutePosition, MoveToPositionTarget); | 1570 | double distanceToTarget = Util.GetDistanceTo(AbsolutePosition, MoveToPositionTarget); |
1571 | m_log.DebugFormat( | 1571 | // m_log.DebugFormat( |
1572 | "[SCENE PRESENCE]: Abs pos of {0} is {1}, target {2}, distance {3}", | 1572 | // "[SCENE PRESENCE]: Abs pos of {0} is {1}, target {2}, distance {3}", |
1573 | Name, AbsolutePosition, MoveToPositionTarget, distanceToTarget); | 1573 | // Name, AbsolutePosition, MoveToPositionTarget, distanceToTarget); |
1574 | 1574 | ||
1575 | // Check the error term of the current position in relation to the target position | 1575 | // Check the error term of the current position in relation to the target position |
1576 | if (distanceToTarget <= 1) | 1576 | if (distanceToTarget <= 1) |
@@ -1688,15 +1688,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
1688 | || pos.Z < 0) | 1688 | || pos.Z < 0) |
1689 | return; | 1689 | return; |
1690 | 1690 | ||
1691 | Vector3 heightAdjust = new Vector3(0, 0, Appearance.AvatarHeight / 2); | 1691 | // Vector3 heightAdjust = new Vector3(0, 0, Appearance.AvatarHeight / 2); |
1692 | pos += heightAdjust; | 1692 | // pos += heightAdjust; |
1693 | 1693 | // | |
1694 | // Anti duck-walking measure | 1694 | // // Anti duck-walking measure |
1695 | if (Math.Abs(pos.Z - AbsolutePosition.Z) < 0.2f) | 1695 | // if (Math.Abs(pos.Z - AbsolutePosition.Z) < 0.2f) |
1696 | { | 1696 | // { |
1697 | // m_log.DebugFormat("[SCENE PRESENCE]: Adjusting MoveToPosition from {0} to {1}", pos, AbsolutePosition); | 1697 | //// m_log.DebugFormat("[SCENE PRESENCE]: Adjusting MoveToPosition from {0} to {1}", pos, AbsolutePosition); |
1698 | pos.Z = AbsolutePosition.Z; | 1698 | // pos.Z = AbsolutePosition.Z; |
1699 | } | 1699 | // } |
1700 | 1700 | ||
1701 | m_moveToPositionInProgress = true; | 1701 | m_moveToPositionInProgress = true; |
1702 | MoveToPositionTarget = pos; | 1702 | MoveToPositionTarget = pos; |