From b3d65221579d63a0747593936b16caad9c45a95c Mon Sep 17 00:00:00 2001
From: Andy Baker <andy@andybak.net>
Date: Thu, 3 Oct 2024 13:27:49 +0100
Subject: [PATCH] See if this fixes issues with wand controls triggering on
 stylus input

[CI BUILD]
---
 Assets/Scripts/Input/UnityXRControllerInfo.cs | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/Assets/Scripts/Input/UnityXRControllerInfo.cs b/Assets/Scripts/Input/UnityXRControllerInfo.cs
index ad69ab4043..3d7707137b 100644
--- a/Assets/Scripts/Input/UnityXRControllerInfo.cs
+++ b/Assets/Scripts/Input/UnityXRControllerInfo.cs
@@ -131,6 +131,11 @@ public override void Update()
             }
         }
 
+        private bool IsStylusActive()
+        {
+            return stylusState.isActive && isBrush;
+        }
+
         public override Vector2 GetPadValueDelta()
         {
             var action = FindAction("ThumbAxis");
@@ -179,7 +184,7 @@ public override float GetScrollYDelta()
         public override float GetGripValue()
         {
 #if OCULUS_SUPPORTED
-            if (stylusState.isActive)
+            if (IsStylusActive())
             {
                 return stylusState.cluster_front_value ? 1.0f : 0;
             }
@@ -195,7 +200,7 @@ public override float GetTriggerRatio()
         public override float GetTriggerValue()
         {
 #if OCULUS_SUPPORTED
-            if (stylusState.isActive)
+            if (IsStylusActive())
             {
                 return Math.Max(stylusState.tip_value, stylusState.cluster_middle_value);
             }
@@ -243,13 +248,13 @@ private bool MapVrInput(VrInput input)
                     return FindAction("PadButton").IsPressed();
                 case VrInput.Trigger:
 #if OCULUS_SUPPORTED
-                    if (stylusState.isActive)
+                    if (IsStylusActive())
                         return stylusState.cluster_middle_value > 0.2 || stylusState.tip_value > 0.2;
 #endif
                     return FindAction("TriggerAxis").IsPressed();
                 case VrInput.Grip:
 #if OCULUS_SUPPORTED
-                    if (stylusState.isActive)
+                    if (IsStylusActive())
                         return stylusState.cluster_front_value;
 #endif
                     return FindAction("GripAxis").IsPressed();
@@ -257,7 +262,7 @@ private bool MapVrInput(VrInput input)
                 case VrInput.Button04:
                 case VrInput.Button06:
 #if OCULUS_SUPPORTED
-                    if (stylusState.isActive)
+                    if (IsStylusActive())
                         return stylusState.cluster_back_value;
 #endif
                     return FindAction("PrimaryButton").IsPressed();