Added separate settings for mouse tracking in X and Y axis

Gemmstone · Apr 11, 2024 · ee7ab53 · ee7ab53
1 parent 95e4a44
commit ee7ab53
Show file tree

Hide file tree

Showing 4 changed files with 336 additions and 89 deletions.
diff --git a/Core/Settings.py b/Core/Settings.py
@@ -41,9 +41,12 @@ def __init__(self, parameters, exe_dir):
         self.originYwhammy.setValue(self.parameters.get("originXwhammy", 0) * -1)
         self.degWhammy.setValue(self.parameters.get("degWhammy", 0))
 
-        self.cursorScale.setValue(self.parameters.get("cursorScale", 0.01))
+        self.cursorScaleX.setValue(self.parameters.get("cursorScaleX", self.parameters.get("cursorScale", 0.01)))
+        self.cursorScaleY.setValue(self.parameters.get("cursorScaleY", self.parameters.get("cursorScale", 0.01)))
         self.invert_mouse_x.setChecked(self.parameters.get("invert_mouse_x", 1) == 1)
         self.invert_mouse_y.setChecked(self.parameters.get("invert_mouse_y", 0) == 1)
+        self.track_mouse_x.setChecked(self.parameters.get("track_mouse_x", 1) == 1)
+        self.track_mouse_y.setChecked(self.parameters.get("track_mouse_y", 1) == 1)
 
         self.deadzone.setValue(self.parameters.get("deadzone", 0.0550))
         self.player.setValue(self.parameters.get("player", 0))
@@ -112,9 +115,12 @@ def __init__(self, parameters, exe_dir):
         self.posGuitarDownY.valueChanged.connect(self.save_current)
         self.rotationGuitarDown.valueChanged.connect(self.save_current)
 
-        self.cursorScale.valueChanged.connect(self.save_current)
+        self.cursorScaleX.valueChanged.connect(self.save_current)
+        self.cursorScaleY.valueChanged.connect(self.save_current)
         self.invert_mouse_x.toggled.connect(self.save_current)
         self.invert_mouse_y.toggled.connect(self.save_current)
+        self.track_mouse_x.toggled.connect(self.save_current)
+        self.track_mouse_y.toggled.connect(self.save_current)
 
         self.deg.valueChanged.connect(self.save_current)
         self.degZoom.valueChanged.connect(self.save_current)
@@ -285,9 +291,12 @@ def save(self):
         self.parameters["invertAxis"] = 1 if self.invertAxis.isChecked() else 0
         self.parameters["chords"] = self.get_chords()
 
-        self.parameters["cursorScale"] = self.cursorScale.value()
+        self.parameters["cursorScaleX"] = self.cursorScaleX.value()
+        self.parameters["cursorScaleY"] = self.cursorScaleY.value()
         self.parameters["invert_mouse_x"] = 1 if self.invert_mouse_x.isChecked() else 0
         self.parameters["invert_mouse_y"] = 1 if self.invert_mouse_y.isChecked() else 0
+        self.parameters["track_mouse_x"] = 1 if self.track_mouse_x.isChecked() else 0
+        self.parameters["track_mouse_y"] = 1 if self.track_mouse_y.isChecked() else 0
         self.parameters["cursor"] = self.cursorGroup.isChecked()
 
         self.parameters['mode'] = 'display' if self.display.isChecked() else 'move' if self.move.isChecked() else 'guitar'

diff --git a/Core/Viewer.py b/Core/Viewer.py
@@ -78,9 +78,12 @@ def handle_runtime_html(self, soup, image_div, image_list):
                 cursor_div['class'] = [
                     "cursor_div" if layer.get("cursor", False) else "ignore"
                 ]
-                cursor_div['cursorScale'] = layer.get("cursorScale", 0.01)
+                cursor_div['cursorScaleX'] = layer.get("cursorScaleX", layer.get("cursorScale", 0.01))
+                cursor_div['cursorScaleY'] = layer.get("cursorScaleY", layer.get("cursorScale", 0.01))
                 cursor_div['invert_mouse_x'] = layer.get("invert_mouse_x", 1)
                 cursor_div['invert_mouse_y'] = layer.get("invert_mouse_y", 0)
+                cursor_div['track_mouse_x'] = layer.get("track_mouse_x", 1)
+                cursor_div['track_mouse_y'] = layer.get("track_mouse_y", 1)
 
                 controller_buttons_div = soup.new_tag('div', style=f"""
                                     position: absolute !important;