ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 18:25:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

When calling osNpcMoveTo(), rotate the avatar in the direction of travel.

Browse Source 
This stops the npc walking backwards if the target is directly behind.
This means that the npc no longer returns to its original rotation once movement has finished.
If you want this behaviour, please store and reset the original rotation after movement.
This is somewhat to address http://opensimulator.org/mantis/view.php?id=5678
This commit is contained in:
Justin Clark-Casey (justincc)
2011-09-21 19:28:41 +01:00
parent aadf7dd91c
commit 8159fd7110
3 changed files with 115 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -585,7 +585,11 @@ namespace OpenSim.Region.Framework.Scenes
public Quaternion Rotation
{
get { return m_bodyRot; }
set { m_bodyRot = value; }
set
{
m_bodyRot = value;
m_log.DebugFormat("[SCENE PRESENCE]: Body rot for {0} set to {1}", Name, m_bodyRot);
}
}
public Quaternion PreviousRotation
@@ -1711,7 +1715,7 @@ namespace OpenSim.Region.Framework.Scenes
// Fudge factor. It appears that if one clicks "go here" on a piece of ground, the go here request is
// always slightly higher than the actual terrain height.
// FIXME: This constrains NOC movements as well, so should be somewhere else.
// FIXME: This constrains NPC movements as well, so should be somewhere else.
if (pos.Z - terrainHeight < 0.2)
pos.Z = terrainHeight;
@@ -1727,6 +1731,21 @@ namespace OpenSim.Region.Framework.Scenes
MovingToTarget = true;
MoveToPositionTarget = pos;
// Rotate presence around the z-axis to point in same direction as movement.
// Ignore z component of vector
Vector3 localVectorToTarget3D = pos - AbsolutePosition;
Vector3 localVectorToTarget2D = new Vector3((float)(localVectorToTarget3D.X), (float)(localVectorToTarget3D.Y), 0f);
// m_log.DebugFormat("[SCENE PRESENCE]: Local vector to target is {0}", localVectorToTarget2D);
// Calculate the yaw.
Vector3 angle = new Vector3(0, 0, (float)(Math.Atan2(localVectorToTarget2D.Y, localVectorToTarget2D.X)));
// m_log.DebugFormat("[SCENE PRESENCE]: Angle is {0}", angle);
Rotation = Quaternion.CreateFromEulers(angle);
// m_log.DebugFormat("[SCENE PRESENCE]: Body rot for {0} set to {1}", Name, Rotation);
Vector3 agent_control_v3 = new Vector3();
HandleMoveToTargetUpdate(ref agent_control_v3);
AddNewMovement(agent_control_v3);