Add gamepad gyro and flick stick support

README.md

@@ -41,7 +41,7 @@ If you turn the [Doom logo upside down](https://www.reddit.com/r/Doom/comments/8
  * Support for voxels in KVX format.
  * 3D audio, supporting stereo and up to 7.1 surround sound with an optional HRTF mode, as well as PC speaker emulation.
  * Several music backends: native MIDI, FluidSynth with a bundled soundfont, built-in OPL3 emulator. Digital music and sound formats supported by libsndfile, module music supported by libxmp.
- * Modern gamepad support.
+ * Modern gamepad support, including gyro controls and the flick stick control scheme.
  * Mouselook.
  * Autoload directories.
  * Savegame backward compatibility up to `MBF.EXE`.
@@ -163,6 +163,13 @@ Copyright:
  © 2023 liPillON.  
 License: [GPL-2.0+](https://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
 
+Files: `src/i_flickstick.*, src/i_gyro.*`  
+Copyright:  
+ © 2018-2021 Julian "Jibb" Smart;  
+ © 2021-2024 Nicolas Lessard;  
+ © 2024 ceski.  
+License: [MIT](https://opensource.org/licenses/MIT)
+
 Files: `src/nano_bsp.*`  
 Copyright: © 2023 Andrew Apted.  
 License: [MIT](https://opensource.org/licenses/MIT)

src/CMakeLists.txt

@@ -33,8 +33,10 @@ set(WOOF_SOURCES
     hu_stuff.c             hu_stuff.h
     i_3dsound.c
     i_endoom.c             i_endoom.h
+    i_flickstick.c         i_flickstick.h
     i_gamepad.c            i_gamepad.h
     i_glob.c               i_glob.h
+    i_gyro.c               i_gyro.h
     i_input.c              i_input.h
     i_main.c
     i_mbfsound.c
@@ -67,6 +69,7 @@ set(WOOF_SOURCES
     m_random.c             m_random.h
     mn_snapshot.c          mn_snapshot.h
                            m_swap.h
+                           m_vector.h
     memio.c                memio.h
     midifallback.c         midifallback.h
     midifile.c             midifile.h

src/am_map.c

@@ -518,7 +518,7 @@ static void AM_changeWindowLoc(void)
 //
 void AM_initVariables(void)
 {
-  static event_t st_notify = { ev_keyup, AM_MSGENTERED };
+  static event_t st_notify = {.type = ev_keyup, .data1.i = AM_MSGENTERED};
 
   automapactive = true;
 
@@ -691,7 +691,7 @@ static void AM_LevelInit(void)
 //
 void AM_Stop (void)
 {
-  static event_t st_notify = { 0, ev_keyup, AM_MSGEXITED };
+  static event_t st_notify = {.type = 0, .data1.i = ev_keyup, .data2.i = AM_MSGEXITED};
 
   memset(buttons_state, 0, sizeof(buttons_state));
 
@@ -829,7 +829,7 @@ boolean AM_Responder
         rc = false;
     else if (M_InputActivated(input_map_zoomout))
     {
-      if (ev->type == ev_mouseb_down && M_IsMouseWheel(ev->data1))
+      if (ev->type == ev_mouseb_down && M_IsMouseWheel(ev->data1.i))
       {
         mousewheelzoom = true;
         mtof_zoommul = m_zoomout_mouse;
@@ -840,7 +840,7 @@ boolean AM_Responder
     }
     else if (M_InputActivated(input_map_zoomin))
     {
-      if (ev->type == ev_mouseb_down && M_IsMouseWheel(ev->data1))
+      if (ev->type == ev_mouseb_down && M_IsMouseWheel(ev->data1.i))
       {
         mousewheelzoom = true;
         mtof_zoommul = m_zoomin_mouse;

src/d_event.h

@@ -21,6 +21,8 @@
 #ifndef __D_EVENT__
 #define __D_EVENT__
 
+#include "doomtype.h"
+
 //
 // Event handling.
 //
@@ -38,20 +40,27 @@ typedef enum evtype_e
   ev_joyb_up,
   ev_joystick,
   ev_joystick_state,
+  ev_gyro,
 
   // Quit event. Triggered when the user clicks the "close" button
   // to terminate the application.
   ev_quit,
 } evtype_t;
 
+typedef union evdata_u
+{
+  int32_t i;
+  float f;
+} evdata_t;
+
 // Event structure.
 typedef struct event_s
 {
-  evtype_t  type;
-  int       data1;    // keys / mouse/joystick buttons / left axis x
-  int       data2;    // mouse/mouse clicks / left axis y
-  int       data3;    // mouse / right axis x
-  int       data4;    // right axis y
+  evtype_t type;
+  evdata_t data1; // keys / mouse/joystick buttons / left axis x
+  evdata_t data2; // mouse/mouse clicks / left axis y
+  evdata_t data3; // mouse / right axis x
+  evdata_t data4; // right axis y
 } event_t;
 
 #define EV_RESIZE_VIEWPORT 1

src/d_main.c

@@ -45,6 +45,7 @@
 #include "g_game.h"
 #include "hu_stuff.h"
 #include "i_endoom.h"
+#include "i_gamepad.h"
 #include "i_glob.h"
 #include "i_input.h"
 #include "i_printf.h"
@@ -203,7 +204,16 @@ void D_PostEvent(event_t *ev)
       if (uncapped && raw_input)
       {
         G_MovementResponder(ev);
-        G_PrepControllerTiccmd();
+        G_PrepGamepadTiccmd();
+        return;
+      }
+      break;
+
+    case ev_gyro:
+      if (uncapped && raw_input)
+      {
+        G_MovementResponder(ev);
+        G_PrepGyroTiccmd();
         return;
       }
       break;
@@ -236,8 +246,6 @@ void D_ProcessEvents (void)
 //  draw current display, possibly wiping it from the previous
 //
 
-boolean input_ready;
-
 // wipegamestate can be set to -1 to force a wipe on the next draw
 gamestate_t    wipegamestate = GS_DEMOSCREEN;
 static int     screen_melt = wipe_Melt;
@@ -265,14 +273,12 @@ void D_Display (void)
   if (nodrawers)                    // for comparative timing / profiling
     return;
 
-  input_ready = (!menuactive && gamestate == GS_LEVEL && !paused);
-
   if (uncapped)
   {
     // [AM] Figure out how far into the current tic we're in as a fixed_t.
     fractionaltic = I_GetFracTime();
 
-    if (input_ready && raw_input)
+    if (!menuactive && gamestate == GS_LEVEL && !paused && raw_input)
     {
       I_StartDisplay();
     }
@@ -2471,7 +2477,7 @@ void D_DoomMain(void)
 
   I_Printf(VB_INFO, "I_Init: Setting up machine state.");
   I_InitTimer();
-  I_InitController();
+  I_InitGamepad();
   I_InitSound();
   I_InitMusic();
 
@@ -2487,7 +2493,7 @@ void D_DoomMain(void)
   G_UpdateSideMove();
   G_UpdateAngleFunctions();
   G_UpdateLocalViewFunction();
-  G_UpdateControllerVariables();
+  G_UpdateGamepadVariables();
   G_UpdateMouseVariables();
   R_UpdateViewAngleFunction();
 

src/d_main.h

@@ -48,8 +48,6 @@ boolean D_CheckEndDoom(void);
 // Called by IO functions when input is detected.
 void D_PostEvent(struct event_s *ev);
 
-extern boolean input_ready;
-
 void D_BindMiscVariables(void);
 
 //

src/doomkeys.h

@@ -155,39 +155,40 @@ enum
 
 enum
 {
-    CONTROLLER_A,
-    CONTROLLER_B,
-    CONTROLLER_X,
-    CONTROLLER_Y,
-    CONTROLLER_BACK,
-    CONTROLLER_GUIDE,
-    CONTROLLER_START,
-    CONTROLLER_LEFT_STICK,
-    CONTROLLER_RIGHT_STICK,
-    CONTROLLER_LEFT_SHOULDER,
-    CONTROLLER_RIGHT_SHOULDER,
-    CONTROLLER_DPAD_UP,
-    CONTROLLER_DPAD_DOWN,
-    CONTROLLER_DPAD_LEFT,
-    CONTROLLER_DPAD_RIGHT,
-    CONTROLLER_MISC1,
-    CONTROLLER_PADDLE1,
-    CONTROLLER_PADDLE2,
-    CONTROLLER_PADDLE3,
-    CONTROLLER_PADDLE4,
-    CONTROLLER_TOUCHPAD,
-    CONTROLLER_LEFT_TRIGGER,
-    CONTROLLER_RIGHT_TRIGGER,
-    CONTROLLER_LEFT_STICK_UP,
-    CONTROLLER_LEFT_STICK_DOWN,
-    CONTROLLER_LEFT_STICK_LEFT,
-    CONTROLLER_LEFT_STICK_RIGHT,
-    CONTROLLER_RIGHT_STICK_UP,
-    CONTROLLER_RIGHT_STICK_DOWN,
-    CONTROLLER_RIGHT_STICK_LEFT,
-    CONTROLLER_RIGHT_STICK_RIGHT,
-
-    NUM_CONTROLLER_BUTTONS
+    GAMEPAD_A,
+    GAMEPAD_B,
+    GAMEPAD_X,
+    GAMEPAD_Y,
+    GAMEPAD_BACK,
+    GAMEPAD_GUIDE,
+    GAMEPAD_START,
+    GAMEPAD_LEFT_STICK,
+    GAMEPAD_RIGHT_STICK,
+    GAMEPAD_LEFT_SHOULDER,
+    GAMEPAD_RIGHT_SHOULDER,
+    GAMEPAD_DPAD_UP,
+    GAMEPAD_DPAD_DOWN,
+    GAMEPAD_DPAD_LEFT,
+    GAMEPAD_DPAD_RIGHT,
+    GAMEPAD_MISC1,
+    GAMEPAD_PADDLE1,
+    GAMEPAD_PADDLE2,
+    GAMEPAD_PADDLE3,
+    GAMEPAD_PADDLE4,
+    GAMEPAD_TOUCHPAD_PRESS,
+    GAMEPAD_TOUCHPAD_TOUCH,
+    GAMEPAD_LEFT_TRIGGER,
+    GAMEPAD_RIGHT_TRIGGER,
+    GAMEPAD_LEFT_STICK_UP,
+    GAMEPAD_LEFT_STICK_DOWN,
+    GAMEPAD_LEFT_STICK_LEFT,
+    GAMEPAD_LEFT_STICK_RIGHT,
+    GAMEPAD_RIGHT_STICK_UP,
+    GAMEPAD_RIGHT_STICK_DOWN,
+    GAMEPAD_RIGHT_STICK_LEFT,
+    GAMEPAD_RIGHT_STICK_RIGHT,
+
+    NUM_GAMEPAD_BUTTONS
 };
 
 enum
@@ -225,12 +226,10 @@ enum
 
 enum
 {
-    LAYOUT_DEFAULT,
-    LAYOUT_SWAP,
-    LAYOUT_LEGACY,
-    LAYOUT_LEGACY_SWAP,
+    GYRO_TURN,
+    GYRO_LOOK,
 
-    NUM_LAYOUTS
+    NUM_GYRO_AXES
 };
 
 #endif // __DOOMKEYS__