Merge pull request #93 from ivan-ushakov/joystick-support-with-sdl

Joystick support with SDL
KD-lab-Open-Source · Feb 23, 2024 · 3f54cbb · 3f54cbb
2 parents 697a06b + 5ca3183
commit 3f54cbb
Show file tree

Hide file tree

Showing 7 changed files with 185 additions and 520 deletions.
diff --git a/MechoSoma/CMakeLists.txt b/MechoSoma/CMakeLists.txt
@@ -341,7 +341,6 @@ set(GAME_SOURCES
     Xreal/Handle.h
     Xreal/HydrophobicObject.cpp
     Xreal/HydrophobicObject.h
-    Xreal/Joystick
     Xreal/LCP_ContactSolver.cpp
     Xreal/LCP_ContactSolver.h
     Xreal/LCP_Solver.cpp
@@ -446,7 +445,7 @@ set(GAME_SOURCES
     Xreal/gen_xreal.h
     Xreal/pt.cpp
     # Xreal/Joystick
-    Xreal/Joystick/XJoystick_port.cpp
+    Xreal/Joystick/XJoystick.cpp
     # iScreen
     iScreen/SCRIPTS/SCR_DEFS.H
     iScreen/ACS_CORE.CPP

diff --git a/MechoSoma/XTool/xgraph.cpp b/MechoSoma/XTool/xgraph.cpp
@@ -221,7 +221,16 @@ void XGR_Mouse::SetCursor(int sx, int sy, int num, void* p)
 
 void XGR_Mouse::SetPos(int x, int y)
 {
-	// TODO
+	LastPosX = PosX;
+	LastPosY = PosY;
+
+	LastSizeX = SizeX;
+	LastSizeY = SizeY;
+
+	PosX = x;
+	PosY = y;
+
+	AdjustPos();
 }
 
 void XGR_Mouse::SetClipAuto(void)