admin/imprudence
1
0
Fork 0
mirror of https://github.com/imprudence/imprudence.git synced 2026-08-14 00:58:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support the ESC key on SpaceMouse Pro.

Browse Source
This commit is contained in:
David Walter Seikel
2014-04-12 06:05:27 +10:00
parent 3ff6340619
commit 37c0c64248
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
linden/indra/newview/llviewerjoystick.cpp
+20 -3
View File
@@ -33,6 +33,7 @@
#include "llviewerprecompiledheaders.h"
#include "llviewerjoystick.h"
#include "llviewerkeyboard.h"
#include "llviewercontrol.h"
#include "llviewerwindow.h"
@@ -302,7 +303,7 @@ void LLViewerJoystick::updateStatus()
mAxes[i] = (F32) mNdofDev->axes[i] / mNdofDev->axes_max;
}
for (int i=0; i<16; i++)
for (int i=0; i<32; i++)
{
mBtn[i] = mNdofDev->buttons[i];
}
@@ -323,7 +324,7 @@ F32 LLViewerJoystick::getJoystickAxis(U32 axis) const
// -----------------------------------------------------------------------------
U32 LLViewerJoystick::getJoystickButton(U32 button) const
{
if (button < 16)
if (button < 32)
{
return mBtn[button];
}
@@ -1029,6 +1030,22 @@ void LLViewerJoystick::scanJoystick()
{
toggle_flycam = 0;
}
static long hit_esc = 0;
if (mBtn[22] == 1)
{
if (mBtn[22] != hit_esc)
{
hit_esc = mBtn[22];
gViewerKeyboard.handleKey(KEY_ESCAPE, MASK_NONE, false);
}
}
else
{
hit_esc = 0;
}
if (!mOverrideCamera && !(LLToolMgr::getInstance()->inBuildMode() && gSavedSettings.getBOOL("JoystickBuildEnabled")))
{
@@ -1057,7 +1074,7 @@ bool LLViewerJoystick::isLikeSpaceNavigator() const
|| strncmp(mNdofDev->product, "SpaceBall", 9) == 0
|| strncmp(mNdofDev->product, "SpaceExplorer", 13) == 0
|| strncmp(mNdofDev->product, "SpaceMouse", 10) == 0
|| strncmp(mNdofDev->product, "SpaceOrb", 8) == 0 // Not actually suppored anyway.
|| strncmp(mNdofDev->product, "SpaceOrb", 8) == 0 // Not actually supported anyway.
|| strncmp(mNdofDev->product, "SpacePilot", 10) == 0
|| strncmp(mNdofDev->product, "SpaceTraveler", 13) == 0));
#else
linden/indra/newview/llviewerjoystick.h
+1 -1
View File
@@ -91,7 +91,7 @@ protected:
private:
F32 mAxes[6];
long mBtn[16];
long mBtn[32];
EJoystickDriverState mDriverState;
NDOF_Device *mNdofDev;
bool mResetFlag;