fix rotation behavior in tactical and single pilot (#2157)

Co-authored-by: aBlueShadow <falter@mxdreamer>
daid · Sep 6, 2024 · 2cea4df · 2cea4df
1 parent 405e499
commit 2cea4df
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/src/screens/crew1/singlePilotScreen.cpp b/src/screens/crew1/singlePilotScreen.cpp
@@ -50,19 +50,22 @@ SinglePilotScreen::SinglePilotScreen(GuiContainer* owner)
     radar->setRangeIndicatorStepSize(1000.0)->shortRange()->enableGhostDots()->enableWaypoints()->enableCallsigns()->enableHeadingIndicators()->setStyle(GuiRadarView::Circular);
     radar->setCallbacks(
         [this](sp::io::Pointer::Button button, glm::vec2 position) {
+            auto last_target = targets.get();
             targets.setToClosestTo(position, 250, TargetsContainer::Targetable);
-            if (my_spaceship && targets.get())
+            if (my_spaceship && targets.get() && (targets.get() != last_target))
                 my_spaceship->commandSetTarget(targets.get());
             else if (my_spaceship)
                 my_spaceship->commandTargetRotation(vec2ToAngle(position - my_spaceship->getPosition()));
         },
-        [](glm::vec2 position) {
-            if (my_spaceship)
+        [this](glm::vec2 position) {
+            targets.setToClosestTo(position, 250, TargetsContainer::Targetable);
+            if (my_spaceship && !targets.get())
+                drag_rotate=true;
+            if (drag_rotate)
                 my_spaceship->commandTargetRotation(vec2ToAngle(position - my_spaceship->getPosition()));
         },
-        [](glm::vec2 position) {
-            if (my_spaceship)
-                my_spaceship->commandTargetRotation(vec2ToAngle(position - my_spaceship->getPosition()));
+        [this](glm::vec2 position) {
+           drag_rotate=false;
         }
     );
     radar->setAutoRotating(PreferencesManager::get("single_pilot_radar_lock","0")=="1");

diff --git a/src/screens/crew1/singlePilotScreen.h b/src/screens/crew1/singlePilotScreen.h
@@ -31,6 +31,7 @@ class SinglePilotScreen : public GuiOverlay
     GuiRotationDial* missile_aim;
     GuiMissileTubeControls* tube_controls;
     GuiToggleButton* lock_aim;
+    bool drag_rotate;
 public:
     SinglePilotScreen(GuiContainer* owner);
 

diff --git a/src/screens/crew4/tacticalScreen.cpp b/src/screens/crew4/tacticalScreen.cpp
@@ -45,19 +45,22 @@ TacticalScreen::TacticalScreen(GuiContainer* owner)
     // Control targeting and piloting with radar interactions.
     radar->setCallbacks(
         [this](sp::io::Pointer::Button button, glm::vec2 position) {
+            auto last_target = targets.get();
             targets.setToClosestTo(position, 250, TargetsContainer::Targetable);
-            if (my_spaceship && targets.get())
+            if (my_spaceship && targets.get() && (targets.get() != last_target))
                 my_spaceship->commandSetTarget(targets.get());
             else if (my_spaceship)
                 my_spaceship->commandTargetRotation(vec2ToAngle(position - my_spaceship->getPosition()));
         },
         [this](glm::vec2 position) {
-            if (my_spaceship)
+            targets.setToClosestTo(position, 250, TargetsContainer::Targetable);
+            if (my_spaceship && !targets.get())
+                drag_rotate=true;
+            if (drag_rotate)
                 my_spaceship->commandTargetRotation(vec2ToAngle(position - my_spaceship->getPosition()));
         },
         [this](glm::vec2 position) {
-            if (my_spaceship)
-                my_spaceship->commandTargetRotation(vec2ToAngle(position - my_spaceship->getPosition()));
+            drag_rotate=false;
         }
     );
     radar->setAutoRotating(PreferencesManager::get("tactical_radar_lock","0")=="1");

diff --git a/src/screens/crew4/tacticalScreen.h b/src/screens/crew4/tacticalScreen.h
@@ -28,6 +28,7 @@ class TacticalScreen : public GuiOverlay
     GuiRotationDial* missile_aim;
     GuiMissileTubeControls* tube_controls;
     GuiToggleButton* lock_aim;
+    bool drag_rotate;
 public:
     TacticalScreen(GuiContainer* owner);