Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

One handed walking and running - LMB+RMB on your avatar

Browse Source
This commit is contained in:
Siana Gearz
2013-11-29 11:33:59 +01:00
parent b7e9a94744
commit ff3f6eccf7
3 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
indra/newview/lltoolfocus.cpp
View File

@@ -45,6 +45,7 @@
#include "llagentcamera.h" #include "llagentcamera.h"
#include "llbutton.h" #include "llbutton.h"
#include "llviewercontrol.h" #include "llviewercontrol.h"
#include "llviewerkeyboard.h"
#include "lldrawable.h" #include "lldrawable.h"
#include "llhoverview.h" #include "llhoverview.h"
#include "llhudmanager.h" #include "llhudmanager.h"
@@ -312,9 +313,15 @@ BOOL LLToolCamera::handleMouseUp(S32 x, S32 y, MASK mask)
return TRUE; return TRUE;
} }
static bool right_hold_mouse_walk=false;
BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask) BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)
{ {
if(right_hold_mouse_walk)
{
agent_push_forward(KEYSTATE_LEVEL);
}
S32 dx = gViewerWindow->getCurrentMouseDX(); S32 dx = gViewerWindow->getCurrentMouseDX();
S32 dy = gViewerWindow->getCurrentMouseDY(); S32 dy = gViewerWindow->getCurrentMouseDY();
@@ -449,8 +456,36 @@ BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)
return TRUE; return TRUE;
} }
BOOL LLToolCamera::handleRightMouseDown(S32 x, S32 y, MASK mask)
{
if(mMouseSteering)
{
agent_push_forward(KEYSTATE_DOWN);
right_hold_mouse_walk = true;
return TRUE;
}
else
{
return FALSE;
}
}
BOOL LLToolCamera::handleRightMouseUp(S32 x, S32 y, MASK mask)
{
if(mMouseSteering || right_hold_mouse_walk)
{
agent_push_forward(KEYSTATE_UP);
right_hold_mouse_walk = false;
return TRUE;
}
else
{
return FALSE;
}
}
void LLToolCamera::onMouseCaptureLost() void LLToolCamera::onMouseCaptureLost()
{ {
releaseMouse(); releaseMouse();
handleRightMouseUp(0,0,0);
} }

2
indra/newview/lltoolfocus.h
View File

@@ -47,6 +47,8 @@ public:
virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);
virtual BOOL handleHover(S32 x, S32 y, MASK mask); virtual BOOL handleHover(S32 x, S32 y, MASK mask);
virtual BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
virtual BOOL handleRightMouseUp(S32 x, S32 y, MASK mask);
virtual void onMouseCaptureLost(); virtual void onMouseCaptureLost();

1
indra/newview/llviewerkeyboard.h
View File

@@ -94,4 +94,5 @@ protected:
extern LLViewerKeyboard gViewerKeyboard; extern LLViewerKeyboard gViewerKeyboard;
extern bool isCrouch; extern bool isCrouch;
void agent_push_forward(EKeystate s);
#endif // LL_LLVIEWERKEYBOARD_H #endif // LL_LLVIEWERKEYBOARD_H