Update to spice2x-25-04-25 (pre-apply)

> broken commit

games/drs/drs.h

@@ -2,6 +2,7 @@
 
 #include "games/game.h"
 #include "external/linalg.h"
+#include "touch/touch.h"
 
 namespace games::drs {
 
@@ -11,7 +12,7 @@ namespace games::drs {
         DRS_MOVE = 2,
     };
 
-    typedef struct {
+    typedef struct drs_touch {
         int type = DRS_UP;
         int id = 0;
         double x = 0.0;
@@ -20,27 +21,20 @@ namespace games::drs {
         double height = 1;
     } drs_touch_t;
 
-    struct VRFoot {
-        uint32_t id;
-        uint32_t index = ~0u;
-        float length = 3.1f;
-        float size_base = 0.05f;
-        float size_scale = 0.1f;
-        float height = 3.f;
-        linalg::aliases::float4 rotation {0, 0, 0, 1};
-        drs_touch_t event {};
-        uint32_t get_index();
-        linalg::aliases::float3 to_world(linalg::aliases::float3 pos);
-    };
+#define DRS_TAPELED_ROWS 49
+#define DRS_TAPELED_COLS 38
+#define DRS_TAPELED_COLS_TOTAL (DRS_TAPELED_ROWS * DRS_TAPELED_COLS)
 
-    extern char DRS_TAPELED[38 * 49][3];
-    extern linalg::aliases::float3 VR_SCALE;
-    extern linalg::aliases::float3 VR_OFFSET;
-    extern float VR_ROTATION;
-    extern VRFoot VR_FOOTS[2];
+// each r,g,b value is stored in a char but 215 is the highest you'll see from the game at 100% brightness in the test menu
+#define DRS_TAPELED_MAX_VAL 215
+
+    extern char DRS_TAPELED[DRS_TAPELED_COLS_TOTAL][3];
+    extern std::vector<TouchEvent> TOUCH_EVENTS;
+    extern bool DISABLE_TOUCH;
+    extern bool TRANSPOSE_TOUCH;
 
     void fire_touches(drs_touch_t *events, size_t event_count);
-    void start_vr();
+    void start_touch();
 
     class DRSGame : public games::Game {
     public: