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

Sync with alchemy/v-r for flying instead of jumping on button press (Left Stick Click)

Browse Source
This commit is contained in:
Inusaito Sayori
2014-05-14 22:58:16 -04:00
parent 81affe719f
commit 929b75989c
1 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
indra/newview/llviewerjoystick.cpp
View File

@@ -722,12 +722,38 @@ void LLViewerJoystick::moveAvatar(bool reset)
}
bool is_zero = true;
static bool button_held = false;
if (mBtn[sType == XBOX ? XBOX_L_STICK_CLICK : 1] == 1)
{
agentJump();
// If AutomaticFly is enabled, then button1 merely causes a
// jump (as the up/down axis already controls flying) if on the
// ground, or cease flight if already flying.
// If AutomaticFly is disabled, then button1 toggles flying.
if (gSavedSettings.getBOOL("AutomaticFly"))
{
if (!gAgent.getFlying())
{
gAgent.moveUp(1);
}
else if (!button_held)
{
button_held = true;
gAgent.setFlying(FALSE);
}
}
else if (!button_held)
{
button_held = true;
gAgent.setFlying(!gAgent.getFlying());
}
is_zero = false;
}
else
{
button_held = false;
}
F32 axis_scale[] =
{