fix(Input): Controller analogue stick previous state

1 files changed, 20 insertions, 15 deletions

diff --git a/src/splitscreen_duo/input.py b/src/splitscreen_duo/input.py
index a947315..29f97cb 100644
--- a/src/splitscreen_duo/input.py
+++ b/src/splitscreen_duo/input.py
@@ -48,24 +48,29 @@ class Input:
 
         return None
 
-    def _get_controller_input(self, event):
-        # Analog stick
-        if event.type == pygame.JOYAXISMOTION:
-            if event.axis == 0:  # X-axis
-                curr_x = event.value
+    def _get_analog_state(self):
+        if self.controller:
+            x = self.controller.get_axis(0)  # X-axis
+            y = self.controller.get_axis(1)  # Y-axis
 
-                if curr_x <= -0.1:
-                    return "RIGHT"
-                if curr_x >= 0.1:
-                    return "LEFT"
+            if x <= -0.1:
+                return "RIGHT"
 
-            elif event.axis == 1:  # Y-axis
-                curr_y = event.value
+            if x >= 0.1:
+                return "LEFT"
 
-                if curr_y <= -0.1:
-                    return "UP"
-                if curr_y >= 0.1:
-                    return "DOWN"
+            if y <= -0.1:
+                return "UP"
+
+            if y >= 0.1:
+                return "DOWN"
+
+        return None
+
+    def _get_controller_input(self, event):
+        # Analog stick
+        if event.type == pygame.JOYAXISMOTION:
+            return self._get_analog_state()
         # D-pad
         elif event.type == pygame.JOYHATMOTION:
             prev_hat = self.prev_hat_states