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

[Joystick] Use the button layout for the chosen controller type

Browse Source 
Using the drop down now FORCES your controller to be detected
as your selection for the duration of the session until you choose another
This commit is contained in:
Lirusaito
2019-03-21 01:26:23 -04:00
parent 95ff7acd6d
commit c9226f6b63
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llviewerjoystick.cpp
View File

@@ -111,6 +111,17 @@ enum DS3Keys
DS3_LOGO_KEY
};
void set_joystick_type(const S32& type)
{
switch (type)
{
case 0: sType = SPACE_NAV; break;
case 1: case 2: sType = XBOX; break;
case 3: sType = DS3; break;
default: sType = UNKNOWN; break;
}
}
S32 get_joystick_type()
{
switch (sType)
@@ -1393,6 +1404,7 @@ void LLViewerJoystick::setSNDefaults(S32 type)
const bool is_3d_cursor = true;
#endif
set_joystick_type(type); // Breaks resetting to default but allows declaring a new identity and button config for the controller
//gViewerWindow->alertXml("CacheWillClear");
const bool ouya = type == 1;
const bool xbox = ouya || type == 2;