Merge pull request libretro#281 from Karojen/master

Add left stick options for IR mode
JesseTG · Aug 30, 2022 · 016a592 · 016a592
2 parents 645cd0d + 409bfdc
commit 016a592
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/Source/Core/DolphinLibretro/Input.cpp b/Source/Core/DolphinLibretro/Input.cpp
@@ -755,6 +755,13 @@ void retro_set_controller_port_device(unsigned port, unsigned device)
           wmTilt->SetControlExpression(2, "`" + devAnalog + ":X1-`");  // Left
           wmTilt->SetControlExpression(3, "`" + devAnalog + ":X1+`");  // Right
         }
+        if (Libretro::Options::irMode != 3 && Libretro::Options::irMode != 4)
+        {
+          wmTilt->SetControlExpression(0, "`" + devAnalog + ":Y0-`");  // Forward
+          wmTilt->SetControlExpression(1, "`" + devAnalog + ":Y0+`");  // Backward
+          wmTilt->SetControlExpression(2, "`" + devAnalog + ":X0-`");  // Left
+          wmTilt->SetControlExpression(3, "`" + devAnalog + ":X0+`");  // Right
+        }
       }
       else
       {
@@ -798,6 +805,18 @@ void retro_set_controller_port_device(unsigned port, unsigned device)
         static_cast<ControllerEmu::NumericSetting<bool>*>(wmIR->numeric_settings[5].get())
           ->SetValue(true);                                           // Auto hide
       }
+      else if (Libretro::Options::irMode == 3 || Libretro::Options::irMode == 4)
+      {
+        // Set left stick to control the IR
+        wmIR->SetControlExpression(0, "`" + devAnalog + ":Y0-`");     // Up
+        wmIR->SetControlExpression(1, "`" + devAnalog + ":Y0+`");     // Down
+        wmIR->SetControlExpression(2, "`" + devAnalog + ":X0-`");     // Left
+        wmIR->SetControlExpression(3, "`" + devAnalog + ":X0+`");     // Right
+        static_cast<ControllerEmu::NumericSetting<bool>*>(wmIR->numeric_settings[4].get())
+          ->SetValue(Libretro::Options::irMode == 3);                 // Relative input
+        static_cast<ControllerEmu::NumericSetting<bool>*>(wmIR->numeric_settings[5].get())
+          ->SetValue(true);                                           // Auto hide
+      }
       else
       {
         // Mouse controls IR

diff --git a/Source/Core/DolphinLibretro/Options.cpp b/Source/Core/DolphinLibretro/Options.cpp
@@ -176,6 +176,8 @@ Option<bool> fastmem("dolphin_fastmem", "Fastmem", true);
 Option<int> irMode("dolphin_ir_mode", "Wiimote IR Mode", 1,
     {"Right Stick controls pointer (relative)",
      "Right Stick controls pointer (absolute)",
+     "Left Stick controls pointer (relative)",
+     "Left Stick controls pointer (absolute)",
      "Mouse controls pointer"});
 Option<int> irCenter("dolphin_ir_offset", "Wiimote IR Vertical Offset",
     {{"10", 10}, {"11", 11}, {"12", 12}, {"13", 13}, {"14", 14}, {"15", 15}, {"16", 16}, {"17", 17}, {"18", 18}, {"19", 19},