From 379ad6163b58e149c62a35ed6b994682b0575214 Mon Sep 17 00:00:00 2001 From: minenice55 Date: Mon, 25 Jul 2022 12:49:43 -0400 Subject: [PATCH] move duplicate code to own method --- .../SettingsDialog/Tabs/ControllerSettings.cs | 92 +++++++------------ 1 file changed, 35 insertions(+), 57 deletions(-) diff --git a/Assets/Scripts/LevelEditor/SettingsDialog/Tabs/ControllerSettings.cs b/Assets/Scripts/LevelEditor/SettingsDialog/Tabs/ControllerSettings.cs index 4136dfc7..2c30343a 100644 --- a/Assets/Scripts/LevelEditor/SettingsDialog/Tabs/ControllerSettings.cs +++ b/Assets/Scripts/LevelEditor/SettingsDialog/Tabs/ControllerSettings.cs @@ -40,36 +40,8 @@ namespace HeavenStudio.Editor { InputController lastController = PlayerInput.GetInputController(1); InputController newController = PlayerInput.GetInputControllers()[controllersDropdown.value]; - lastController.SetPlayer(-1); - newController.SetPlayer(1); - - if (typeof(InputJoyshock) == lastController.GetType()) { - InputJoyshock con = (InputJoyshock) lastController; - con.UnAssignOtherHalf(); - } - - if (typeof(InputJoyshock) == newController.GetType()) { - InputJoyshock con = (InputJoyshock) newController; - StartCoroutine(SelectionVibrate(con)); - con.UnAssignOtherHalf(); - } - - currentControllerLabel.text = "Current Controller: " + newController.GetDeviceName(); - ShowControllerIcon(newController); - - InputController.InputFeatures features = newController.GetFeatures(); - if (features.HasFlag(InputController.InputFeatures.Extra_SplitControllerLeft) || features.HasFlag(InputController.InputFeatures.Extra_SplitControllerRight)) - { - pairSelectLR = !features.HasFlag(InputController.InputFeatures.Extra_SplitControllerLeft); - pairSearchItem.SetActive(true); - StartPairSearch(); - } - else - { - pairSearchItem.SetActive(false); - CancelPairSearch(); - } + AssignController(newController, lastController); }); } @@ -79,38 +51,11 @@ namespace HeavenStudio.Editor foreach (var controller in controllers) { if (controller.GetLastButtonDown() > 0 || controller.GetLastKeyDown() > 0) { InputController lastController = PlayerInput.GetInputController(1); - lastController.SetPlayer(-1); - controller.SetPlayer(1); isAutoSearching = false; autoSearchLabel.SetActive(false); controllersDropdown.value = PlayerInput.GetInputControllerId(1); - if (typeof(InputJoyshock) == lastController.GetType()) { - ((InputJoyshock)lastController).UnAssignOtherHalf(); - } - - if (typeof(InputJoyshock) == controller.GetType()) { - InputJoyshock con = (InputJoyshock) controller; - StartCoroutine(SelectionVibrate(con)); - con.UnAssignOtherHalf(); - } - - currentControllerLabel.text = "Current Controller: " + controller.GetDeviceName(); - ShowControllerIcon(controller); - - InputController.InputFeatures features = controller.GetFeatures(); - if (features.HasFlag(InputController.InputFeatures.Extra_SplitControllerLeft) || features.HasFlag(InputController.InputFeatures.Extra_SplitControllerRight)) - { - pairSelectLR = !features.HasFlag(InputController.InputFeatures.Extra_SplitControllerLeft); - pairSearchItem.SetActive(true); - StartPairSearch(); - } - else - { - pairSearchItem.SetActive(false); - CancelPairSearch(); - } - + AssignController(controller, lastController); } } } @@ -137,6 +82,39 @@ namespace HeavenStudio.Editor } } + void AssignController(InputController newController, InputController lastController) + { + lastController.SetPlayer(-1); + newController.SetPlayer(1); + + if (typeof(InputJoyshock) == lastController.GetType()) { + InputJoyshock con = (InputJoyshock) lastController; + con.UnAssignOtherHalf(); + } + + if (typeof(InputJoyshock) == newController.GetType()) { + InputJoyshock con = (InputJoyshock) newController; + StartCoroutine(SelectionVibrate(con)); + con.UnAssignOtherHalf(); + } + + currentControllerLabel.text = "Current Controller: " + newController.GetDeviceName(); + ShowControllerIcon(newController); + + InputController.InputFeatures features = newController.GetFeatures(); + if (features.HasFlag(InputController.InputFeatures.Extra_SplitControllerLeft) || features.HasFlag(InputController.InputFeatures.Extra_SplitControllerRight)) + { + pairSelectLR = !features.HasFlag(InputController.InputFeatures.Extra_SplitControllerLeft); + pairSearchItem.SetActive(true); + StartPairSearch(); + } + else + { + CancelPairSearch(); + pairSearchItem.SetActive(false); + } + } + public void StartAutoSearch() { if (!isPairSearching) {