libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-11-27 10:20:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9677 from hrydgard/joystick-sensitivity

Browse Source 
Quick hack to enable analog stick sensitivity on non-windows platforms.
This commit is contained in:
Unknown W. Brackets 2017-05-20 13:41:27 -04:00 committed by GitHub
commit 984060a85f
6 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Core/Config.cpp
View File

@ -690,8 +690,9 @@ static ConfigSetting controlSettings[] = {
ConfigSetting("XInputAnalogDeadzone", &g_Config.fXInputAnalogDeadzone, 0.24f, true, true), ConfigSetting("XInputAnalogDeadzone", &g_Config.fXInputAnalogDeadzone, 0.24f, true, true),
ConfigSetting("XInputAnalogInverseMode", &g_Config.iXInputAnalogInverseMode, 0, true, true), ConfigSetting("XInputAnalogInverseMode", &g_Config.iXInputAnalogInverseMode, 0, true, true),
ConfigSetting("XInputAnalogInverseDeadzone", &g_Config.fXInputAnalogInverseDeadzone, 0.0f, true, true), ConfigSetting("XInputAnalogInverseDeadzone", &g_Config.fXInputAnalogInverseDeadzone, 0.0f, true, true),
ConfigSetting("XInputAnalogSensitivity", &g_Config.fXInputAnalogSensitivity, 1.0f, true, true),
#endif #endif
// Also reused as generic analog sensitivity
ConfigSetting("XInputAnalogSensitivity", &g_Config.fXInputAnalogSensitivity, 1.0f, true, true),
ConfigSetting("AnalogLimiterDeadzone", &g_Config.fAnalogLimiterDeadzone, 0.6f, true, true), ConfigSetting("AnalogLimiterDeadzone", &g_Config.fAnalogLimiterDeadzone, 0.6f, true, true),
ConfigSetting("UseMouse", &g_Config.bMouseControl, false, true, true), ConfigSetting("UseMouse", &g_Config.bMouseControl, false, true, true),

1
Core/Config.h
View File

@ -386,6 +386,7 @@ public:
float fDInputAnalogInverseDeadzone; float fDInputAnalogInverseDeadzone;
float fDInputAnalogSensitivity; float fDInputAnalogSensitivity;
// We also use the XInput settings as analog settings on other platforms like Android.
float fXInputAnalogDeadzone; float fXInputAnalogDeadzone;
int iXInputAnalogInverseMode; int iXInputAnalogInverseMode;
float fXInputAnalogInverseDeadzone; float fXInputAnalogInverseDeadzone;

2
SDL/SDLJoystick.cpp
View File

@ -152,7 +152,7 @@ void SDLJoystick::ProcessInput(SDL_Event &event){
AxisInput axis; AxisInput axis;
axis.axisId = event.caxis.axis; axis.axisId = event.caxis.axis;
// 1.2 to try to approximate the PSP's clamped rectangular range. // 1.2 to try to approximate the PSP's clamped rectangular range.
axis.value = 1.2 * event.caxis.value / 32767.0f; axis.value = 1.2 * event.caxis.value * g_Config.fXInputAnalogSensitivity / 32767.0f;
if (axis.value > 1.0f) axis.value = 1.0f; if (axis.value > 1.0f) axis.value = 1.0f;
if (axis.value < -1.0f) axis.value = -1.0f; if (axis.value < -1.0f) axis.value = -1.0f;
axis.deviceId = DEVICE_ID_PAD_0 + getDeviceIndex(event.caxis.which); axis.deviceId = DEVICE_ID_PAD_0 + getDeviceIndex(event.caxis.which);

2
UI/GameSettingsScreen.cpp
View File

@ -558,6 +558,8 @@ void GameSettingsScreen::CreateViews() {
controlsSettings->Add(new PopupMultiChoice(&g_Config.iXInputAnalogInverseMode, co->T("Analog Mapper Mode"), inverseDeadzoneModes, 0, ARRAY_SIZE(inverseDeadzoneModes), co->GetName(), screenManager())); controlsSettings->Add(new PopupMultiChoice(&g_Config.iXInputAnalogInverseMode, co->T("Analog Mapper Mode"), inverseDeadzoneModes, 0, ARRAY_SIZE(inverseDeadzoneModes), co->GetName(), screenManager()));
controlsSettings->Add(new PopupSliderChoiceFloat(&g_Config.fXInputAnalogInverseDeadzone, 0.0f, 1.0f, co->T("Analog Mapper Low End", "Analog Mapper Low End (Inverse Deadzone)"), 0.01f, screenManager(), "/ 1.0")); controlsSettings->Add(new PopupSliderChoiceFloat(&g_Config.fXInputAnalogInverseDeadzone, 0.0f, 1.0f, co->T("Analog Mapper Low End", "Analog Mapper Low End (Inverse Deadzone)"), 0.01f, screenManager(), "/ 1.0"));
controlsSettings->Add(new PopupSliderChoiceFloat(&g_Config.fXInputAnalogSensitivity, 0.0f, 10.0f, co->T("Analog Mapper High End", "Analog Mapper High End (Axis Sensitivity)"), 0.01f, screenManager(), "x")); controlsSettings->Add(new PopupSliderChoiceFloat(&g_Config.fXInputAnalogSensitivity, 0.0f, 10.0f, co->T("Analog Mapper High End", "Analog Mapper High End (Axis Sensitivity)"), 0.01f, screenManager(), "x"));
#else
controlsSettings->Add(new PopupSliderChoiceFloat(&g_Config.fXInputAnalogSensitivity, 0.0f, 10.0f, co->T("Analog Axis Sensitivity", "Analog Axis Sensitivity"), 0.01f, screenManager(), "x"));
#endif #endif
controlsSettings->Add(new ItemHeader(co->T("Keyboard", "Keyboard Control Settings"))); controlsSettings->Add(new ItemHeader(co->T("Keyboard", "Keyboard Control Settings")));

4
android/jni/app-android.cpp
View File

@ -814,6 +814,10 @@ extern "C" jboolean Java_org_ppsspp_ppsspp_NativeApp_joystickAxis(
axis.axisId = axisId; axis.axisId = axisId;
axis.deviceId = deviceId; axis.deviceId = deviceId;
axis.value = value; axis.value = value;
float sensitivity = g_Config.fXInputAnalogSensitivity;
axis.value *= sensitivity;
return NativeAxis(axis); return NativeAxis(axis);
} }

8
ios/ViewController.mm
View File

@ -579,7 +579,7 @@ static GraphicsContext *graphicsContext;
axisInput.deviceId = DEVICE_ID_PAD_0; axisInput.deviceId = DEVICE_ID_PAD_0;
axisInput.flags = 0; axisInput.flags = 0;
axisInput.axisId = JOYSTICK_AXIS_X; axisInput.axisId = JOYSTICK_AXIS_X;
axisInput.value = value; axisInput.value = value * g_Config.fXInputAnalogSensitivity;
NativeAxis(axisInput); NativeAxis(axisInput);
}; };
@ -588,7 +588,7 @@ static GraphicsContext *graphicsContext;
axisInput.deviceId = DEVICE_ID_PAD_0; axisInput.deviceId = DEVICE_ID_PAD_0;
axisInput.flags = 0; axisInput.flags = 0;
axisInput.axisId = JOYSTICK_AXIS_Y; axisInput.axisId = JOYSTICK_AXIS_Y;
axisInput.value = -value; axisInput.value = -value * g_Config.fXInputAnalogSensitivity;
NativeAxis(axisInput); NativeAxis(axisInput);
}; };
@ -598,7 +598,7 @@ static GraphicsContext *graphicsContext;
axisInput.deviceId = DEVICE_ID_PAD_0; axisInput.deviceId = DEVICE_ID_PAD_0;
axisInput.flags = 0; axisInput.flags = 0;
axisInput.axisId = JOYSTICK_AXIS_Z; axisInput.axisId = JOYSTICK_AXIS_Z;
axisInput.value = value; axisInput.value = value * g_Config.fXInputAnalogSensitivity;
NativeAxis(axisInput); NativeAxis(axisInput);
}; };
@ -607,7 +607,7 @@ static GraphicsContext *graphicsContext;
axisInput.deviceId = DEVICE_ID_PAD_0; axisInput.deviceId = DEVICE_ID_PAD_0;
axisInput.flags = 0; axisInput.flags = 0;
axisInput.axisId = JOYSTICK_AXIS_RZ; axisInput.axisId = JOYSTICK_AXIS_RZ;
axisInput.value = -value; axisInput.value = -value * g_Config.fXInputAnalogSensitivity;
NativeAxis(axisInput); NativeAxis(axisInput);
}; };
} }