ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update enum naming as discussed

This commit is contained in:
Nadia Holmquist Pedersen 2023-07-03 15:13:51 +02:00
parent 67879b1821
commit 1d3d9cd150
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/frontend/qt_sdl/Input.cpp
View File

@ -216,26 +216,26 @@ bool JoystickTouchModeAvailable(JoystickTouchMode mode)
return false; return false;
switch (mode.mode) { switch (mode.mode) {
case JoystickTouchMode::ANALOG_STICK: case JoystickTouchMode::analogStick:
{ {
SDL_GameControllerAxis xAxis = mode.stick == JoystickTouchMode::LEFT_STICK SDL_GameControllerAxis xAxis = mode.stick == JoystickTouchMode::leftStick
? SDL_CONTROLLER_AXIS_LEFTX ? SDL_CONTROLLER_AXIS_LEFTX
: SDL_CONTROLLER_AXIS_RIGHTX; : SDL_CONTROLLER_AXIS_RIGHTX;
SDL_GameControllerAxis yAxis = mode.stick == JoystickTouchMode::LEFT_STICK SDL_GameControllerAxis yAxis = mode.stick == JoystickTouchMode::leftStick
? SDL_CONTROLLER_AXIS_LEFTY ? SDL_CONTROLLER_AXIS_LEFTY
: SDL_CONTROLLER_AXIS_RIGHTY; : SDL_CONTROLLER_AXIS_RIGHTY;
return SDL_GameControllerHasAxis(GameController, xAxis) return SDL_GameControllerHasAxis(GameController, xAxis)
&& SDL_GameControllerHasAxis(GameController, yAxis); && SDL_GameControllerHasAxis(GameController, yAxis);
} }
case JoystickTouchMode::TOUCHPAD: case JoystickTouchMode::touchpad:
if (mode.style == JoystickTouchMode::RELATIVE && !SDL_GameControllerHasButton(GameController, SDL_CONTROLLER_BUTTON_TOUCHPAD)) if (mode.style == JoystickTouchMode::relative && !SDL_GameControllerHasButton(GameController, SDL_CONTROLLER_BUTTON_TOUCHPAD))
return false; return false;
return SDL_GameControllerGetNumTouchpads(GameController) != 0; return SDL_GameControllerGetNumTouchpads(GameController) != 0;
case JoystickTouchMode::GYROSCOPE: case JoystickTouchMode::gyroscope:
return SDL_GameControllerHasSensor(GameController, SDL_SENSOR_GYRO); return SDL_GameControllerHasSensor(GameController, SDL_SENSOR_GYRO);
case JoystickTouchMode::NONE: case JoystickTouchMode::none:
return true; return true;
} }
} }
@ -245,7 +245,7 @@ bool SetJoystickTouchMode(JoystickTouchMode mode)
if (!JoystickTouchModeAvailable(mode)) if (!JoystickTouchModeAvailable(mode))
return false; return false;
SDL_GameControllerSetSensorEnabled(GameController, SDL_SENSOR_GYRO, mode.mode == JoystickTouchMode::GYROSCOPE ? SDL_TRUE : SDL_FALSE); SDL_GameControllerSetSensorEnabled(GameController, SDL_SENSOR_GYRO, mode.mode == JoystickTouchMode::gyroscope ? SDL_TRUE : SDL_FALSE);
JoystickTouch = mode; JoystickTouch = mode;
return true; return true;
@ -301,14 +301,14 @@ void UpdateJoystickTouch()
return; return;
} }
if (mode == JoystickTouchMode::TOUCHPAD) if (mode == JoystickTouchMode::touchpad)
{ {
u8 state; u8 state;
float x, y, pressure; float x, y, pressure;
SDL_GameControllerGetTouchpadFinger(GameController, 0, 0, &state, &x, &y, &pressure); SDL_GameControllerGetTouchpadFinger(GameController, 0, 0, &state, &x, &y, &pressure);
if (style == JoystickTouchMode::RELATIVE) if (style == JoystickTouchMode::relative)
{ {
if (state == 1) if (state == 1)
{ {
@ -350,11 +350,11 @@ void UpdateJoystickTouch()
JoyTouchY = (u8) round(y * 192.f); JoyTouchY = (u8) round(y * 192.f);
} }
} }
else if (mode == JoystickTouchMode::ANALOG_STICK) else if (mode == JoystickTouchMode::analogStick)
{ {
SDL_GameControllerAxis axisX = stick == JoystickTouchMode::LEFT_STICK SDL_GameControllerAxis axisX = stick == JoystickTouchMode::leftStick
? SDL_CONTROLLER_AXIS_LEFTX : SDL_CONTROLLER_AXIS_RIGHTX; ? SDL_CONTROLLER_AXIS_LEFTX : SDL_CONTROLLER_AXIS_RIGHTX;
SDL_GameControllerAxis axisY = stick == JoystickTouchMode::LEFT_STICK SDL_GameControllerAxis axisY = stick == JoystickTouchMode::leftStick
? SDL_CONTROLLER_AXIS_LEFTY : SDL_CONTROLLER_AXIS_RIGHTY; ? SDL_CONTROLLER_AXIS_LEFTY : SDL_CONTROLLER_AXIS_RIGHTY;
s16 x = SDL_GameControllerGetAxis(GameController, axisX); s16 x = SDL_GameControllerGetAxis(GameController, axisX);
@ -362,7 +362,7 @@ void UpdateJoystickTouch()
float fx = ((float) x) / 32768.f; float fx = ((float) x) / 32768.f;
float fy = ((float) y) / 32768.f; float fy = ((float) y) / 32768.f;
if (style == JoystickTouchMode::RELATIVE) if (style == JoystickTouchMode::relative)
{ {
HandleRelativeInput(fx, fy, JoystickTouch.sensitivity); HandleRelativeInput(fx, fy, JoystickTouch.sensitivity);
} }
@ -374,7 +374,7 @@ void UpdateJoystickTouch()
newTouching = JoystickButtonDown(JoystickTouch.touchButton); newTouching = JoystickButtonDown(JoystickTouch.touchButton);
} }
else if (mode == JoystickTouchMode::GYROSCOPE) else if (mode == JoystickTouchMode::gyroscope)
{ {
float gyroPos[3] = {0}; float gyroPos[3] = {0};
@ -433,7 +433,7 @@ void Process()
HotkeyRelease = LastHotkeyMask & ~HotkeyMask; HotkeyRelease = LastHotkeyMask & ~HotkeyMask;
LastHotkeyMask = HotkeyMask; LastHotkeyMask = HotkeyMask;
if (JoystickTouch.mode != JoystickTouchMode::NONE) if (JoystickTouch.mode != JoystickTouchMode::none)
UpdateJoystickTouch(); UpdateJoystickTouch();
} }

6
src/frontend/qt_sdl/Input.h
View File

@ -34,9 +34,9 @@ extern bool JoyTouching;
extern bool JoyTouchReleased; extern bool JoyTouchReleased;
struct JoystickTouchMode { struct JoystickTouchMode {
enum Mode { NONE = 0, ANALOG_STICK, TOUCHPAD, GYROSCOPE }; enum Mode { none = 0, analogStick, touchpad, gyroscope };
enum Style { ABSOLUTE = 0, RELATIVE }; enum Style { absolute = 0, relative };
enum AnalogStick { LEFT_STICK = 0, RIGHT_STICK }; enum AnalogStick { leftStick = 0, rightStick };
Mode mode; Mode mode;
Style style; Style style;

2
src/frontend/qt_sdl/main.cpp
View File

@ -1070,7 +1070,7 @@ void ScreenPanelNative::paintEvent(QPaintEvent* event)
painter.setTransform(screenTrans[i]); painter.setTransform(screenTrans[i]);
painter.drawImage(screenrc, screen[screenKind[i]]); painter.drawImage(screenrc, screen[screenKind[i]]);
if (i == 1 && Input::JoystickTouch.mode != Input::JoystickTouchMode::NONE) if (i == 1 && Input::JoystickTouch.mode != Input::JoystickTouchMode::none)
{ {
QRect cursorRect = QRect(Input::JoyTouchX - 3, Input::JoyTouchY - 3, 5, 5); QRect cursorRect = QRect(Input::JoyTouchX - 3, Input::JoyTouchY - 3, 5, 5);
painter.setPen(QColor::fromRgb(255, 0, 0)); painter.setPen(QColor::fromRgb(255, 0, 0));