From 722313a4ffd87e5368d2b31e9408cecf661b612c Mon Sep 17 00:00:00 2001 From: Mutex- Date: Wed, 12 Jun 2024 08:19:14 +0100 Subject: [PATCH 1/2] Changed the FindJoystick method to be able to handle the 3 joysticks of the EF24 --- TriquetraInput2/ControllerAction.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/TriquetraInput2/ControllerAction.cs b/TriquetraInput2/ControllerAction.cs index 3dba146..4a5f7fe 100644 --- a/TriquetraInput2/ControllerAction.cs +++ b/TriquetraInput2/ControllerAction.cs @@ -456,7 +456,15 @@ public static void Thumbstick(Binding binding, int joystickValue) internal static VRJoystick FindJoystick() { - return GameObject.FindObjectOfType(false); + var joysticks = GameObject.FindObjectsOfType(false); + + var joystick = joysticks.FirstOrDefault(); + if (joysticks.Length > 1) + { + joystick = joysticks.FirstOrDefault(stick => stick.name == "joyInteractable_sideFront"); + } + + return joystick; } private static bool menuButtonPressed = false; From 6da47929e96d3b6f5df40eed9c3bc25020353157 Mon Sep 17 00:00:00 2001 From: Mutex- Date: Thu, 13 Jun 2024 07:14:42 +0100 Subject: [PATCH 2/2] T-55 and AH94 have 2 joysticks so try it this way. --- TriquetraInput2/ControllerAction.cs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/TriquetraInput2/ControllerAction.cs b/TriquetraInput2/ControllerAction.cs index 4a5f7fe..aa850b3 100644 --- a/TriquetraInput2/ControllerAction.cs +++ b/TriquetraInput2/ControllerAction.cs @@ -458,12 +458,9 @@ internal static VRJoystick FindJoystick() { var joysticks = GameObject.FindObjectsOfType(false); - var joystick = joysticks.FirstOrDefault(); - if (joysticks.Length > 1) - { - joystick = joysticks.FirstOrDefault(stick => stick.name == "joyInteractable_sideFront"); - } - + var joystick = joysticks.FirstOrDefault(stick => stick.name == "joyInteractable_sideFront") ?? + joysticks.FirstOrDefault(); + return joystick; }