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

* Fixes mantis: #3241 

* Uses 'mouselook' or left mouse button down, to determine when to use the camera's UP axis to determine the direction of movement.
* We crouch-slide no more.
0.6.4-rc1
Teravus Ovares 2009-03-07 01:18:59 +00:00
parent 3a93bb992f
commit ebe84907ae
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -547,6 +547,9 @@ namespace OpenSim.Region.Framework.Scenes
} }
private bool m_inTransit; private bool m_inTransit;
private bool m_mouseLook;
private bool m_leftButtonDown;
public bool IsInTransit public bool IsInTransit
{ {
get { return m_inTransit; } get { return m_inTransit; }
@ -1141,6 +1144,8 @@ namespace OpenSim.Region.Framework.Scenes
{ {
StandUp(); StandUp();
} }
m_mouseLook = (flags & (uint) AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0;
m_leftButtonDown = (flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_LBUTTON_DOWN) != 0;
lock (scriptedcontrols) lock (scriptedcontrols)
{ {
if (scriptedcontrols.Count > 0) if (scriptedcontrols.Count > 0)
@ -1206,8 +1211,14 @@ namespace OpenSim.Region.Framework.Scenes
bool bResetMoveToPosition = false; bool bResetMoveToPosition = false;
Vector3[] dirVectors; Vector3[] dirVectors;
if (m_physicsActor.Flying) dirVectors = Dir_Vectors;
else dirVectors = GetWalkDirectionVectors(); // use camera up angle when in mouselook and not flying or when holding the left mouse button down and not flying
// this prevents 'jumping' in inappropriate situations.
if ((m_mouseLook && !m_physicsActor.Flying) || (m_leftButtonDown && !m_physicsActor.Flying))
dirVectors = GetWalkDirectionVectors();
else
dirVectors = Dir_Vectors;
foreach (Dir_ControlFlags DCF in Enum.GetValues(typeof (Dir_ControlFlags))) foreach (Dir_ControlFlags DCF in Enum.GetValues(typeof (Dir_ControlFlags)))
{ {