Added 'Auto' controller backend (#850)

libultraship/libultraship/ControlDeck.cpp

@@ -2,7 +2,7 @@
 
 #include "Window.h"
 #include "Controller.h"
-#include "DisconnectedController.h"
+#include "VirtualController.h"
 #include "KeyboardController.h"
 #include "SDLController.h"
 #include <Utils/StringHelper.h>
@@ -27,8 +27,9 @@ void Ship::ControlDeck::ScanPhysicalDevices() {
 		}
 	}
 
+	physicalDevices.push_back(std::make_shared<VirtualController>("Auto", "Auto", true));
 	physicalDevices.push_back(std::make_shared<KeyboardController>());
-	physicalDevices.push_back(std::make_shared<DisconnectedController>());
+	physicalDevices.push_back(std::make_shared<VirtualController>("Disconnected", "None", false));
 
 	for (const auto& device : physicalDevices) {
 		for (int i = 0; i < MAXCONTROLLERS; i++) {
@@ -51,7 +52,14 @@ void Ship::ControlDeck::SetPhysicalDevice(int slot, int deviceSlot) {
 
 void Ship::ControlDeck::WriteToPad(OSContPad* pad) const {
 	for (size_t i = 0; i < virtualDevices.size(); i++) {
-		physicalDevices[virtualDevices[i]]->Read(&pad[i], i);
+		const std::shared_ptr<Controller> backend = physicalDevices[virtualDevices[i]];
+		if (backend->GetGuid() == "Auto") {
+			for (const auto& device : physicalDevices) {
+				device->Read(&pad[i], i);
+			}
+			continue;
+		}
+		backend->Read(&pad[i], i);
 	}
 }
 

libultraship/libultraship/InputEditor.cpp

@@ -26,7 +26,7 @@ namespace Ship {
 
 		float size = 40;
 		bool readingMode = BtnReading == n64Btn;
-		bool disabled = BtnReading != -1 && !readingMode || !backend->Connected();
+		bool disabled = (BtnReading != -1 && !readingMode) || !backend->Connected() || backend->GetGuid() == "Auto";
 		ImVec2 len = ImGui::CalcTextSize(label);
 		ImVec2 pos = ImGui::GetCursorPos();
 		ImGui::SetCursorPosY(pos.y + len.y / 4);
@@ -90,7 +90,7 @@ namespace Ship {
 		std::shared_ptr<Controller> Backend = devices[vDevices[CurrentPort]];
 		DeviceProfile& profile =Backend->profiles[CurrentPort];
 		float sensitivity = profile.Thresholds[SENSITIVITY];
-		bool IsKeyboard = Backend->GetGuid() == "Keyboard" || !Backend->Connected();
+		bool IsKeyboard = Backend->GetGuid() == "Keyboard"  || Backend->GetGuid() == "Auto" || !Backend->Connected();
 		const char* ControllerName = Backend->GetControllerName();
 
 		if (ControllerName != nullptr && ImGui::BeginCombo("##ControllerEntries", ControllerName)) {

libultraship/libultraship/VirtualController.h

@@ -4,18 +4,20 @@
 
 #include "Controller.h"
 
-class DisconnectedController final : public Ship::Controller {
+class VirtualController final : public Ship::Controller {
 public:
-	DisconnectedController() {
+	VirtualController(const std::string& CUID, const std::string& KeyName, bool Connected) {
-		GUID = "Disconnected";
+		GUID = CUID;
+		isConnected = Connected;
+		ButtonName = KeyName;
 	}
 
 	std::map<std::vector<std::string>, int32_t> ReadButtonPress();
 	void ReadFromSource(int32_t slot) override {}
-	const char* GetControllerName() override { return "Disconnected"; }
+	const char* GetControllerName() override { return GUID.c_str(); }
-	const char* GetButtonName(int slot, int n64Button) override { return "None"; }
+	const char* GetButtonName(int slot, int n64Button) override { return ButtonName.c_str(); }
 	void WriteToSource(int32_t slot, ControllerCallback* controller) override { }
-	bool Connected() const override { return false; }
+	bool Connected() const override { return isConnected; }
 	bool CanRumble() const override { return false; }
 	bool CanGyro()   const override { return false; }
 
@@ -25,6 +27,8 @@ public:
 	std::optional<std::string> GetPadConfSection() { return "Unk"; }
 	void CreateDefaultBinding(int32_t slot) override {}
 protected:
+	std::string ButtonName;
+	bool isConnected = false;
 	std::string GetControllerType() { return "Unk"; }
 	std::string GetConfSection() { return "Unk"; }
 	std::string GetBindingConfSection() { return "Unk"; }

libultraship/libultraship/libultraship.vcxproj

@@ -344,6 +344,7 @@
     <ClCompile Include="SDLController.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="VirtualController.h" />
     <ClInclude Include="Lib\Mercury\Mercury.h" />
     <ClInclude Include="Lib\nlohmann\json.hpp" />
     <ClInclude Include="abi.h" />
@@ -352,7 +353,6 @@
     <ClInclude Include="Blob.h" />
     <ClInclude Include="ControlDeck.h" />
     <ClInclude Include="Cvar.h" />
-    <ClInclude Include="DisconnectedController.h" />
     <ClInclude Include="Environment.h" />
     <ClInclude Include="Factories\AudioFactory.h" />
     <ClInclude Include="InputEditor.h" />

libultraship/libultraship/libultraship.vcxproj.filters

@@ -674,14 +674,14 @@
     <ClInclude Include="ControlDeck.h">
       <Filter>Source Files\Controller</Filter>
     </ClInclude>
-    <ClInclude Include="DisconnectedController.h">
-      <Filter>Source Files\Controller</Filter>
-    </ClInclude>
     <ClInclude Include="Lib\nlohmann\json.hpp">
       <Filter>Source Files\Lib\nlohmann</Filter>
     </ClInclude>
     <ClInclude Include="Lib\Mercury\Mercury.h">
       <Filter>Source Files\Lib\Mercury</Filter>
     </ClInclude>
+    <ClInclude Include="VirtualController.h">
+      <Filter>Source Files\Controller</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>