Initial implementation of gyro aim with GamepadMotionHelpers for sensor fusion

CMakeLists.txt

@@ -148,6 +148,7 @@ set (SOURCES
 target_include_directories(MMRecomp PRIVATE
     ${CMAKE_SOURCE_DIR}/include
     ${CMAKE_SOURCE_DIR}/lib/concurrentqueue
+    ${CMAKE_SOURCE_DIR}/lib/GamepadMotionHelpers
     ${CMAKE_SOURCE_DIR}/lib/RmlUi/Include
     ${CMAKE_SOURCE_DIR}/lib/RmlUi/Backends
     ${CMAKE_SOURCE_DIR}/lib/RT64-HLE/src/contrib

include/recomp_input.h

@@ -63,6 +63,7 @@ namespace recomp {
     float get_input_analog(const std::span<const recomp::InputField> fields);
     bool get_input_digital(const InputField& field);
     bool get_input_digital(const std::span<const recomp::InputField> fields);
+    void get_gyro_deltas(float* x, float* y);
 
     enum class InputDevice {
         Controller,

lib/GamepadMotionHelpers/.gitignore

@@ -0,0 +1,32 @@
+# Prerequisites
+*.d
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+*.smod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app

lib/GamepadMotionHelpers/CMakeLists.txt

@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 3.8)
+
+project(GamepadMotionHelpers LANGUAGES CXX)
+
+add_library(${PROJECT_NAME} INTERFACE)
+add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
+target_include_directories(${PROJECT_NAME}
+        INTERFACE
+            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+            $<INSTALL_INTERFACE:include>)
+		

lib/GamepadMotionHelpers/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020-2023 Julian "Jibb" Smart
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

lib/GamepadMotionHelpers/README.md

@@ -0,0 +1,76 @@
+# GamepadMotionHelpers
+GamepadMotionHelpers is a lightweight header-only library for sensor fusion, gyro calibration, etc. BYO input library (eg [SDL2](https://github.com/libsdl-org/SDL)).
+
+## Units
+Convert your gyro units into **degrees per second** and accelerometer units to **g-force** (1 g = 9.8 m/s^2). You don't have to use these units in your application, but convert to these units when writing to GamepadMotionHelpers and convert back when reading from it. Your input reader might prefer radians per second and metres per second squared, but the datasheets for every IMU I've seen talk about degrees per second and g-force.
+
+## Coordinate Space
+This library uses a Y-up coordinate system. While Z-up is (only slightly) preferable for many games, PlayStation controllers use Y-up, and have set the standard for input libraries like [SDL2](https://github.com/libsdl-org/SDL) and [JSL](https://github.com/JibbSmart/JoyShockLibrary). These libraries convert inputs from other controller types to the same space used by PlayStation's DualShock 4 and DualSense, so that's what's used here.
+
+## Basic Use
+Include the GamepadMotion.hpp file in your C++ project. That's it! Everything you need is in that file, and its only dependency is ```<math.h>```.
+
+For each controller with gyro (and optionally accelerometer), create a ```GamepadMotion``` object. At regular intervals, whether when a new report comes in from the controller or when polling the controller's state, you should call ```ProcessMotion(...)```. This is when you tell your GamepadMotion object the latest gyro (in degrees per second) and accelerometer (in g-force) inputs. You'll also give it the time since the last update for this controller (in seconds).
+
+ProcessMotion takes these inputs, updates some internal values, and then you can use any of the following to read its current state:
+- ```GetCalibratedGyro(float& x, float& y, float& z)``` - Get the controller's angular velocity in degrees per second. This is just the raw gyro you gave it minus the gyro's bias as determined by your calibration settings (more on that below).
+- ```GetGravity(float& x, float& y, float& z)``` - Get the gravity direction in the controller's local space. When the controller is still on a flat surface it'll be approximately (0, -1, 0). The controller can't detect the gravity direction when it's in freefall or being shaken around, but it can make a pretty good guess if its gyro is correctly calibrated and then make further corrections when the controller is still again.
+- ```GetProcessedAcceleration(float& x, float& y, float& z)``` - Get the controller's current acceleration in g-force with gravity removed. Raw accelerometer input includes gravity -- it is only (0, 0, 0) when the controller is in freefall. However, using the gravity direction as calculated for GetGravity, it can remove that component and detect how you're shaking the controller about. This function gives you that acceleration vector with the gravity removed.
+- ```GetOrientation(float& w, float& x, float& y, float& z)``` - Get the controller's orientation. Gyro and accelerometer input are combined to give a good estimate of the controller's orientation.
+
+Additional helper functions are available for taking gravity into account and returning a "world space" or "player space" rotation in two axes. Bear in mind that the **X** and **Y** set by these functions is still around the controller's axes. This means **Y** is the *horizontal* part of the rotation, and **X** is the vertical part. To convert to a mouse-like input, you'll treat the **Y** as the horizontal or yaw input and **X** as the vertical or pitch input. This might be unintuitive, but since it's also true of the "local space" angular velocities obtained from GetCalibratedGyro, this makes it simple to let the user choose between *local space*, *world space*, and *player space* in your game or application by just swapping GetCalibratedGyro for these functions depending on that selection:
+- ```GetWorldSpaceGyro(float& x, float& y, const float sideReductionThreshold = 0.125f)``` - Get the controller's angular velocity in *world space* as described on GyroWiki in the [player space article here](http://gyrowiki.jibbsmart.com/blog:player-space-gyro-and-alternatives-explained#toc6). Yaw input will be derived from motion around the gravity axis, and pitch input from an appropriate pitch axis calculated from the controller's orientation with respect to the gravity axis. Any errors in the calculated gravity axis (though likely very small) will be taken on by the calculated world space gyro rotation, making it slightly less robust than using calibrated gyro directly ("local space" gyro) or using *player space* gyro below. More info in the linked article.
+- ```GetPlayerSpaceGyro(float& x, float& y, const float yawRelaxFactor = 1.41f)``` - Get the controller's angular velocity in *player space* as described on GyroWiki in the [player space article here](http://gyrowiki.jibbsmart.com/blog:player-space-gyro-and-alternatives-explained#toc7). Yaw input will be derived from motion approximately around the gravity axis, without any impact from errors in the gravity calculation. Pitch is just local pitch. It is robust, accommodates players who are used to both local space and world space gyro, while taking on most of the advantages of each. It is proven in popular games and is an ideal default for players using a standalone controller. For handheld (where the screen is part of the controller, such as mobile, Switch, or Steam Deck) local space (using the calibrated gyro input directly) may be preferable. More info in the linked article.
+
+If you want to plug in the gyro and gravity values yourself (perhaps you're using an externally calculated gravity), you can use ```CalculateWorldSpaceGyro``` and ```CalculatePlayerSpaceGyro``` instead. Make sure you use this GamepadMotionHelpers' coordinate space, units, and gravity is normalized, since those are all assumed for these functions.
+
+## Sensor Fusion
+Combining multiple types of sensor like this to get a better picture of the controller's state is called "sensor fusion". Moment-to-moment changes in orientation are detected using the gyro, but that only gives local angular velocity and needs to be correctly calibrated. Errors can accumulate over time. The gravity vector as detected by the accelerometer is used to make corrections to the relevant components of the controller's orientation.
+
+But this cannot be used to correct the controller's orientation around the gravity vector (the **yaw** axis). If you're using the controller's absolute orientation for some reason, this "yaw drift" may need to be accounted for somehow. Some devices also have a magnetometer (compass) to counter yaw drift, but since popular game controllers don't have a magnetometer, I haven't tried it myself. In future, if I get such a device, I'd like to add the option for GamepadMotionHelpers to accept magnetometer input and account for it when calculating values for the above functions.
+
+## Gyro Calibration
+Modern gyroscopes often need calibration. This is like how a [weighing scale](https://en.wikipedia.org/wiki/Weighing_scale) can need calibration to tell it what 'zero' is. Like a weighing scale, a correctly calibrated gyroscope will give an accurate reading. If you're using the gyro input as a mouse, which is the simplest application of a controller's gyro, you can find essential reading on [GyroWiki here](http://gyrowiki.jibbsmart.com/blog:good-gyro-controls-part-1:the-gyro-is-a-mouse).
+
+Calibration just means having the controller sit still and remembering the average reported angular velocity in each axis. This is the gyro's "bias". In GamepadMotionHelpers, I call our best guess at the controller's bias the "calibration offset". GamepadMotionHelpers has some options to help with calibrating:
+
+At any time, you can begin manually calibrating a controller by calling ```StartContinuousCalibration()```. This will start recording the average angular velocity and apply it immediately to any subsequent **GetGalibratedGyro(...)** call. At any time you can ```PauseContinuousCalibration()``` to no longer add current values to the average angular velocity being recorded. You can ```ResetContinousCalibration()``` to remove the recorded average before starting over with **StartContinuousCalibration** again.
+
+You can read the stored calibration values using ```GetCalibrationOffset(float& xOffset, float& yOffset, float& zOffset)```. You can manually set the calibration offset yourself with ```SetCalibrationOffset(float xOffset, float yOffset, float zOffset, int weight)```. This will override all stored values. The **weight** argument at the end determines how strongly these values should be considered over time if Continuous Calibration is still active (new values are still being added to the average). Each new sample has a weight of 1, so if you **SetCalibrationOffset** with a weight of 10, it'll have the weight of 10 samples when calculating the average. If you're not continuing to add samples (Continuous Calibration is not active), the weight will be meaningless. Setting this manually is unusual, so don't worry about it too much if that sounds complicated.
+
+Most games don't ask the user to calibrate the gyro themselves. They have built-in automatic calibration, which I like to call "auto-calibration". There's no such thing as a "good enough" auto-calibration solution -- at least not with only gyro and accelerometer. Every game that has an auto-calibration solution would be made better for more serious players with the option to manually calibrate their gyro, so I urge you to provide players the option to do the same in your game. Having said that, auto-calibration is a useful option for casual players, and you may choose to have it enabled in your game by default.
+
+So GamepadMotionHelpers provides some auto-calibration options. You can call ```SetCalibrationMode(CalibrationMode)``` on each GamepadMotion instance with the following options:
+- ```CalibrationMode::Manual``` - No auto-calibration. This is the default.
+- ```CalibrationMode::Stillness``` - Automatically try to detect when the controller is being held still and update the calibration offset accordingly.
+- ```CalibrationMode::SensorFusion``` - Calculate an angular velocity from changes in the gravity direction as detected by the accelerometer. If these are steady enough, use them to make corrections to the calibration offset. This will only apply to relevant axes.
+
+Many players are already aware of the shortcomings of trying to automatically detect stillness to automatically calibrate the gyro. Whether on Switch, PlayStation, or using PlayStation controllers on PC, players have tried to track a slow or distant target only to have the aimer suddenly stop moving! The game or the platform has **misinterpreted their slow and steady input as the controller being held still**, and they've incorrectly recalibrated accordingly. Players *hate it* when this happens.
+
+**This is why it's important to let players manually calibrate their gyro** if they want to.
+
+Auto-calibration is used so widely in console games that it's speculated that game developers may not have the option to disable it on these platforms. If this is the case, GamepadMotionHelpers offers a big advantage over those platforms: you can disable it and enable it at any time.
+
+You, the game developer, can have your game tell if the player is tracking a distant or slow-moving target. You can tell if the player's aimer is moving towards a visible target or roughly following the movement of one. When it is, maybe disabling the auto-calibration (```SetCalibrationMode(CalibrationMode::Manual)```) could be the difference between good and bad auto-calibration. I don't know if the GamepadMotionHelpers auto-calibration functions are better or worse than their Switch and PlayStation counterparts generally, but by letting you take the game's context into account, you may be able to offer players a way better experience without them having to manually calibrate.
+
+But still give them the option to calibrate manually, please :)
+
+The **SensorFusion** calibration mode has shortcomings of its own. It's much harder to accidentally trick the game into incorrectly calibrating, but the angular velocity calculated from the accelerometer moment-to-moment is generally much less precise. Leaving the controller still, you'll notice the calibrated gyro moving slightly up and down over time. So while the **Stillness** mode is characterised by good behaviour occasionally punctuated by frustrating errors, the **SensorFusion** mode will tend to be more consistently not-quite-right without being terrible.
+
+Secondly, this library currently only combines accelerometer and gyro, so the **SensorFusion** auto-calibration cannot correct the gyro in all axes at the same time. The **SensorFusion**-only mode will be more useful in future when magnetometer input is supported, which can account for the axes that the accelerometer can't.
+
+Both auto-calibration modes can be combined by passing ```CalibrationMode::Stillness | CalibrationMode::SensorFusion``` to **SetCalibrationMode**. In this case, it'll use **Stillness** auto-calibration, but it'll adjust the calibration offset based on any angular velocity implied by changes in the accelerometer input. This tends to give better results than just using **Stillness** or **SensorFusion** on their own.
+
+If you aren't sure what to choose, I'd suggest using the combined ```CalibrationMode::Stillness | CalibrationMode::SensorFusion``` when auto calibration is enabled, but also allowing the player to manually calibrate.
+
+**TODO** This is a clunky way to let the user set up what is obviously the best solution. Maybe I should just call it "hybrid" or something and be done with it?
+
+Auto-calibration can also be used to communicate manual calibration to the player. ```GetAutoCalibrationIsSteady()``` will tell you whether GamepadMotionHelpers thinks the controller is currently being held steady (if auto-calibration is enabled). ```GetAutoCalibrationConfidence()``` will tell you how confident GamepadMotionHelpers is that it has a good calibration value from auto-calibration, from 0-1. Higher confidence means that new calibration changes will be applied more gradually. You can use these functions to detect when a controller needs to be calibrated, prompt the player to put their controller down, detect when they have put their controller down, and show progress for calibration (default 1 second once it starts). You can also override the confidence yourself (```SetAutoCalibrationConfidence()```), and resetting calibration will reset confidence to 0. How quickly confidence grows as well as other calibration settings can be customised in **GamepadMotionSettings**.
+
+## In the Wild
+GamepadMotionHelpers is currently used in:
+- [JoyShockMapper](https://github.com/Electronicks/JoyShockMapper)
+- [JoyShockLibrary](https://github.com/JibbSmart/JoyShockLibrary)
+- JoyShockOverlay
+
+If you know of any other games or applications using GamepadMotionHelpers, please let me know!

patches/input.c

@@ -1,5 +1,54 @@
 #include "patches.h"
 #include "input.h"
+
+
+s32 func_80847190(PlayState* play, Player* this, s32 arg2);
+s16 func_80832754(Player* this, s32 arg1);
+s32 func_8082EF20(Player* this);
+
+// Patched to add gyro aiming
+s32 func_80847190(PlayState* play, Player* this, s32 arg2) {
+    s32 pad;
+    s16 var_s0;
+
+    if (!func_800B7128(this) && !func_8082EF20(this) && !arg2) {
+        var_s0 = play->state.input[0].rel.stick_y * 0xF0;
+        Math_SmoothStepToS(&this->actor.focus.rot.x, var_s0, 0xE, 0xFA0, 0x1E);
+
+        var_s0 = play->state.input[0].rel.stick_x * -0x10;
+        var_s0 = CLAMP(var_s0, -0xBB8, 0xBB8);
+        this->actor.focus.rot.y += var_s0;
+    }
+    else {
+        float gyro_x, gyro_y;
+        recomp_get_gyro_deltas(&gyro_x, &gyro_y);
+
+        s16 temp3;
+
+        temp3 = ((play->state.input[0].rel.stick_y >= 0) ? 1 : -1) *
+            (s32)((1.0f - Math_CosS(play->state.input[0].rel.stick_y * 0xC8)) * 1500.0f);
+        this->actor.focus.rot.x += temp3 + (s32)(gyro_x * -3.0f);
+
+        if (this->stateFlags1 & PLAYER_STATE1_800000) {
+            this->actor.focus.rot.x = CLAMP(this->actor.focus.rot.x, -0x1F40, 0xFA0);
+        }
+        else {
+            this->actor.focus.rot.x = CLAMP(this->actor.focus.rot.x, -0x36B0, 0x36B0);
+        }
+
+        var_s0 = this->actor.focus.rot.y - this->actor.shape.rot.y;
+        temp3 = ((play->state.input[0].rel.stick_x >= 0) ? 1 : -1) *
+            (s32)((1.0f - Math_CosS(play->state.input[0].rel.stick_x * 0xC8)) * -1500.0f);
+        var_s0 += temp3 + (s32)(gyro_y * 3.0f);
+
+        this->actor.focus.rot.y = CLAMP(var_s0, -0x4AAA, 0x4AAA) + this->actor.shape.rot.y;
+    }
+
+    this->unk_AA6 |= 2;
+
+    return func_80832754(this, (play->unk_1887C != 0) || func_800B7128(this) || func_8082EF20(this));
+}
+
 #if 0
 u32 sPlayerItemButtons[] = {
     BTN_B,

patches/input.h

@@ -26,6 +26,7 @@ extern "C" {
         void name(uint8_t* rdram, recomp_context* ctx);
 #endif
 
+DECLARE_FUNC(void, recomp_get_gyro_deltas, float* x, float* y);
 // TODO move these
 DECLARE_FUNC(void, recomp_puts, const char* data, u32 size);
 DECLARE_FUNC(void, recomp_exit);

patches/syms.ld

@@ -7,3 +7,4 @@ recomp_handle_quicksave_actions = 0x81000008;
 recomp_handle_quicksave_actions_main = 0x8100000C;
 osRecvMesg_recomp = 0x81000010;
 osSendMesg_recomp = 0x81000014;
+recomp_get_gyro_deltas = 0x81000018;

src/game/controls.cpp

@@ -120,3 +120,10 @@ extern "C" void recomp_puts(uint8_t* rdram, recomp_context* ctx) {
 extern "C" void recomp_exit(uint8_t* rdram, recomp_context* ctx) {
     ultramodern::quit();
 }
+
+extern "C" void recomp_get_gyro_deltas(uint8_t* rdram, recomp_context* ctx) {
+    float* x_out = _arg<0, float*>(rdram, ctx);
+    float* y_out = _arg<1, float*>(rdram, ctx);
+
+    recomp::get_gyro_deltas(x_out, y_out);
+}

src/game/input.cpp

@@ -6,15 +6,30 @@
 #include "recomp_ui.h"
 #include "SDL.h"
 #include "rt64_layer.h"
+#include "GamepadMotion.hpp"
 
 constexpr float axis_threshold = 0.5f;
 
+struct ControllerState {
+    SDL_GameController* controller;
+    std::array<float, 3> latest_accelerometer;
+    GamepadMotion motion;
+    uint32_t prev_gyro_timestamp;
+    ControllerState() : controller{}, latest_accelerometer{}, motion{}, prev_gyro_timestamp{} {
+        motion.Reset();
+        motion.SetCalibrationMode(GamepadMotionHelpers::CalibrationMode::Stillness | GamepadMotionHelpers::CalibrationMode::SensorFusion);
+    };
+};
+
 static struct {
     const Uint8* keys = nullptr;
     int numkeys = 0;
     std::atomic_int32_t mouse_wheel_pos = 0;
-    std::vector<SDL_JoystickID> controller_ids{};
     std::vector<SDL_GameController*> cur_controllers{};
+    std::unordered_map<SDL_JoystickID, ControllerState> controller_states;
+    std::array<float, 2> rotation_delta{};
+    std::mutex pending_rotation_mutex;
+    std::array<float, 2> pending_rotation_delta{};
 } InputState;
 
 std::atomic<recomp::InputDevice> scanning_device = recomp::InputDevice::COUNT;
@@ -72,7 +87,13 @@ bool sdl_event_filter(void* userdata, SDL_Event* event) {
             printf("Controller added: %d\n", controller_event->which);
             if (controller != nullptr) {
                 printf("  Instance ID: %d\n", SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(controller)));
-                InputState.controller_ids.push_back(SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(controller)));
+                ControllerState& state = InputState.controller_states[SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(controller))];
+                state.controller = controller;
+
+                if (SDL_GameControllerHasSensor(controller, SDL_SensorType::SDL_SENSOR_GYRO) && SDL_GameControllerHasSensor(controller, SDL_SensorType::SDL_SENSOR_ACCEL)) {
+                    SDL_GameControllerSetSensorEnabled(controller, SDL_SensorType::SDL_SENSOR_GYRO, SDL_TRUE);
+                    SDL_GameControllerSetSensorEnabled(controller, SDL_SensorType::SDL_SENSOR_ACCEL, SDL_TRUE);
+                }
             }
         }
         break;
@@ -80,7 +101,7 @@ bool sdl_event_filter(void* userdata, SDL_Event* event) {
         {
             SDL_ControllerDeviceEvent* controller_event = &event->cdevice;
             printf("Controller removed: %d\n", controller_event->which);
-            std::erase(InputState.controller_ids, controller_event->which);
+            InputState.controller_states.erase(controller_event->which);
         }
         break;
     case SDL_EventType::SDL_QUIT:
@@ -113,6 +134,41 @@ bool sdl_event_filter(void* userdata, SDL_Event* event) {
         }
         queue_if_enabled(event);
         break;
+    case SDL_EventType::SDL_CONTROLLERSENSORUPDATE:
+        if (event->csensor.sensor == SDL_SensorType::SDL_SENSOR_ACCEL) {
+            // Convert acceleration to g's.
+            float x = event->csensor.data[0] / SDL_STANDARD_GRAVITY;
+            float y = event->csensor.data[1] / SDL_STANDARD_GRAVITY;
+            float z = event->csensor.data[2] / SDL_STANDARD_GRAVITY;
+            ControllerState& state = InputState.controller_states[event->csensor.which];
+            state.latest_accelerometer[0] = x;
+            state.latest_accelerometer[1] = y;
+            state.latest_accelerometer[2] = z;
+        }
+        else if (event->csensor.sensor == SDL_SensorType::SDL_SENSOR_GYRO) {
+            // constexpr float gyro_threshold = 0.05f;
+            // Convert rotational velocity to degrees per second.
+            constexpr float rad_to_deg = 180.0f / M_PI;
+            float x = event->csensor.data[0] * rad_to_deg;
+            float y = event->csensor.data[1] * rad_to_deg;
+            float z = event->csensor.data[2] * rad_to_deg;
+            ControllerState& state = InputState.controller_states[event->csensor.which];
+            uint64_t cur_timestamp = event->csensor.timestamp;
+            uint32_t delta_ms = cur_timestamp - state.prev_gyro_timestamp;
+            state.motion.ProcessMotion(x, y, z, state.latest_accelerometer[0], state.latest_accelerometer[1], state.latest_accelerometer[2], delta_ms * 0.001f);
+            state.prev_gyro_timestamp = cur_timestamp;
+
+            float rot_x = 0.0f;
+            float rot_y = 0.0f;
+            state.motion.GetPlayerSpaceGyro(rot_x, rot_y);
+
+            {
+                std::lock_guard lock{ InputState.pending_rotation_mutex };
+                InputState.pending_rotation_delta[0] += rot_x;
+                InputState.pending_rotation_delta[1] += rot_y;
+            }
+        }
+        break;
     default:
         queue_if_enabled(event);
         break;
@@ -254,13 +310,21 @@ void recomp::poll_inputs() {
 
     InputState.cur_controllers.clear();
 
-    for (SDL_JoystickID id : InputState.controller_ids) {
-        SDL_GameController* controller = SDL_GameControllerFromInstanceID(id);
+    for (const auto& [id, state] : InputState.controller_states) {
+        (void)id; // Avoid unused variable warning.
+        SDL_GameController* controller = state.controller;
         if (controller != nullptr) {
             InputState.cur_controllers.push_back(controller);
         }
     }
 
+    // Read the deltas while resetting them to zero.
+    {
+        std::lock_guard lock{ InputState.pending_rotation_mutex };
+        InputState.rotation_delta = InputState.pending_rotation_delta;
+        InputState.pending_rotation_delta = { 0.0f, 0.0f };
+    }
+    
     // Quicksaving is disabled for now and will likely have more limited functionality
     // when restored, rather than allowing saving and loading at any point in time.
     #if 0
@@ -368,6 +432,12 @@ bool recomp::get_input_digital(const std::span<const recomp::InputField> fields)
     return ret;
 }
 
+void recomp::get_gyro_deltas(float* x, float* y) {
+    std::array<float, 2> cur_rotation_delta = InputState.rotation_delta;
+    *x = cur_rotation_delta[0];
+    *y = cur_rotation_delta[1];
+}
+
 bool recomp::game_input_disabled() {
     // Disable input if any menu is open.
     return recomp::get_current_menu() != recomp::Menu::None;

src/main/main.cpp

@@ -40,6 +40,7 @@ void exit_error(const char* str, Ts ...args) {
 
 ultramodern::gfx_callbacks_t::gfx_data_t create_gfx() {
     SDL_SetHint(SDL_HINT_WINDOWS_DPI_AWARENESS, "system");
+    SDL_SetHint(SDL_HINT_GAMECONTROLLER_USE_BUTTON_LABELS, "0");
     if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_GAMECONTROLLER) > 0) {
         exit_error("Failed to initialize SDL2: %s\n", SDL_GetError());
     }

ultramodern/events.cpp

@@ -263,7 +263,7 @@ void ultramodern::set_graphics_config(const ultramodern::GraphicsConfig& config)
     events_context.action_queue.enqueue(UpdateConfigAction{});
 }
 
-const ultramodern::GraphicsConfig& ultramodern::get_graphics_config() {
+ultramodern::GraphicsConfig ultramodern::get_graphics_config() {
     return cur_config;
 }