fix: restore controller mapping window menu option (#112)

mm/2s2h/BenGui/BenMenuBar.cpp

@@ -226,11 +226,11 @@ void DrawSettingsMenu() {
         }
     // #region 2S2H [Todo] None of this works yet
         /*
-        if (UIWidgets::BeginMenu("Controller")) {
+        if (UIWidgets::BeginMenu("Controller")) { */
             if (mInputEditorWindow) {
                 UIWidgets::WindowButton("Controller Mapping", "gWindows.InputEditor", mInputEditorWindow);
             }
-
+        /*
         #ifndef __SWITCH__
             UIWidgets::CVarCheckbox("Menubar Controller Navigation", "gControlNav", {
                 .tooltip = "Allows controller navigation of the SOH menu bar (Settings, Enhancements,...)\nCAUTION: "

mm/2s2h/BenGui/SohInputEditorWindow.h

@@ -1,89 +0,0 @@
-#pragma once
-
-#include "stdint.h"
-#include <libultraship/libultraship.h>
-#ifndef IMGUI_DEFINE_MATH_OPERATORS
-#define IMGUI_DEFINE_MATH_OPERATORS
-#endif
-#include <ImGui/imgui.h>
-#include <unordered_map>
-#include <string>
-#include <vector>
-#include <set>
-
-class SohInputEditorWindow : public LUS::GuiWindow {
-  public:
-    using GuiWindow::GuiWindow;
-    ~SohInputEditorWindow();
-
-    void DrawButton(const char* label, int32_t n64Btn, int32_t currentPort, int32_t* btnReading);
-
-    void DrawInputChip(const char* buttonName, ImVec4 color);
-    void DrawAnalogPreview(const char* label, ImVec2 stick, float deadzone = 0, bool gyro = false);
-    void DrawControllerSchema();
-    bool TestingRumble();
-
-  protected:
-    void InitElement() override;
-    void DrawElement() override;
-    void UpdateElement() override;
-
-  private:
-    void DrawStickDirectionLine(const char* axisDirectionName, uint8_t port, uint8_t stick, LUS::Direction direction,
-                                ImVec4 color);
-    void DrawButtonLine(const char* buttonName, uint8_t port, uint16_t bitmask, ImVec4 color);
-    void DrawButtonLineEditMappingButton(uint8_t port, uint16_t bitmask, std::string id);
-    void DrawButtonLineAddMappingButton(uint8_t port, uint16_t bitmask);
-
-    void DrawStickDirectionLineEditMappingButton(uint8_t port, uint8_t stick, LUS::Direction direction, std::string id);
-    void DrawStickDirectionLineAddMappingButton(uint8_t port, uint8_t stick, LUS::Direction direction);
-    void DrawStickSection(uint8_t port, uint8_t stick, int32_t id, ImVec4 color);
-
-    void DrawRumbleSection(uint8_t port);
-    void DrawRemoveRumbleMappingButton(uint8_t port, std::string id);
-    void DrawAddRumbleMappingButton(uint8_t port);
-
-    void DrawLEDSection(uint8_t port);
-    void DrawRemoveLEDMappingButton(uint8_t port, std::string id);
-    void DrawAddLEDMappingButton(uint8_t port);
-
-    void DrawGyroSection(uint8_t port);
-    void DrawRemoveGyroMappingButton(uint8_t port, std::string id);
-    void DrawAddGyroMappingButton(uint8_t port);
-
-    int32_t mGameInputBlockTimer;
-    int32_t mMappingInputBlockTimer;
-    int32_t mRumbleTimer;
-    std::shared_ptr<LUS::ControllerRumbleMapping> mRumbleMappingToTest;
-
-    // mBitmaskToMappingIds[port][bitmask] = { id0, id1, ... }
-    std::unordered_map<uint8_t, std::unordered_map<uint16_t, std::vector<std::string>>> mBitmaskToMappingIds;
-
-    // mStickDirectionToMappingIds[port][stick][direction] = { id0, id1, ... }
-    std::unordered_map<uint8_t,
-                       std::unordered_map<uint8_t, std::unordered_map<LUS::Direction, std::vector<std::string>>>>
-        mStickDirectionToMappingIds;
-
-    void UpdateBitmaskToMappingIds(uint8_t port);
-    void UpdateStickDirectionToMappingIds(uint8_t port);
-
-    void GetButtonColorsForLUSDeviceIndex(LUS::LUSDeviceIndex lusIndex, ImVec4& buttonColor,
-                                          ImVec4& buttonHoveredColor);
-    void DrawLinkTab();
-    void DrawIvanTab();
-    void DrawDebugPortTab(uint8_t portIndex, std::string customName = "");
-    void DrawDevicesTab();
-    std::set<uint16_t> mButtonsBitmasks;
-    std::set<uint16_t> mDpadBitmasks;
-    std::set<uint16_t> mModifierButtonsBitmasks;
-    void DrawButtonDeviceIcons(uint8_t portIndex, std::set<uint16_t> bitmasks);
-    void DrawAnalogStickDeviceIcons(uint8_t portIndex, LUS::Stick stick);
-    void DrawRumbleDeviceIcons(uint8_t portIndex);
-    void DrawGyroDeviceIcons(uint8_t portIndex);
-    void DrawLEDDeviceIcons(uint8_t portIndex);
-    bool mInputEditorPopupOpen;
-    void DrawSetDefaultsButton(uint8_t portIndex);
-    void DrawClearAllButton(uint8_t portIndex);
-
-    void DrawHelpIcon(const std::string& helptext);
-};

mm/2s2h/BenPort.cpp

@@ -54,7 +54,6 @@ CrowdControl* CrowdControl::Instance;
 #include <BenGui/BenGui.hpp>
 #include "BenJsonConversions.hpp"
 
-#include "BenGui/SohInputEditorWindow.h"
 #include "Enhancements/GameInteractor/GameInteractor.h"
 #include "Enhancements/Enhancements.h"
 
@@ -161,6 +160,8 @@ OTRGlobals::OTRGlobals() {
     context->GetResourceManager()->GetResourceLoader()->RegisterResourceFactory(
         LUS::ResourceType::TSH_TexAnim, "TextureAnimation", std::make_shared<LUS::TextureAnimationFactory>());
 
+    context->GetControlDeck()->SetSinglePlayerMappingMode(true);
+
     //gSaveStateMgr = std::make_shared<SaveStateMgr>();
     //gRandomizer = std::make_shared<Randomizer>();
     hasMasterQuest = hasOriginal = false;
@@ -1330,12 +1331,16 @@ extern "C" void OTRControllerCallback(uint8_t rumble) {
     LUS::Context::GetInstance()->GetControlDeck()->GetControllerByPort(0)->GetLED()->SetLEDColor(
         GetColorForControllerLED());
 
-    static std::shared_ptr<SohInputEditorWindow> controllerConfigWindow = nullptr;
+    static std::shared_ptr<LUS::InputEditorWindow> controllerConfigWindow = nullptr;
     if (controllerConfigWindow == nullptr) {
-        controllerConfigWindow = std::dynamic_pointer_cast<SohInputEditorWindow>(
+        controllerConfigWindow = std::dynamic_pointer_cast<LUS::InputEditorWindow>(
             LUS::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Input Editor"));
-    } else if (controllerConfigWindow->TestingRumble()) {
-        return;
+    // TODO: Add SoH Controller Config window rumble testing to upstream LUS config window
+    //       note: the current implementation may not be desired in LUS, as "true" rumble support
+    //             using osMotor calls is planned: https://github.com/Kenix3/libultraship/issues/9
+    //
+    // } else if (controllerConfigWindow->TestingRumble()) {
+    //     return;
     }
 
     if (rumble) {