Allow button and toggle interaction via grab (#138)

realitycollective · Jul 16, 2024 · 94f09f1 · 94f09f1
1 parent 7278338
commit 94f09f1
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 8 deletions.
diff --git a/Runtime/Input/InteractionBehaviours/ButtonBehaviour.cs b/Runtime/Input/InteractionBehaviours/ButtonBehaviour.cs
@@ -34,18 +34,36 @@ public class ButtonClickEvent : UnityEvent { }
         public ButtonClickEvent Click => click;
 
         /// <inheritdoc/>
-        protected override void OnSelectEntered(InteractionEventArgs eventArgs)
+        protected override void OnFirstSelectEntered(InteractionEventArgs eventArgs)
         {
-            if (raiseOnInputDown)
+            if (raiseOnInputDown && !Interactable.IsGrabbed)
             {
                 Click?.Invoke();
             }
         }
 
         /// <inheritdoc/>
-        protected override void OnSelectExited(InteractionExitEventArgs eventArgs)
+        protected override void OnLastSelectExited(InteractionExitEventArgs eventArgs)
         {
-            if (!raiseOnInputDown)
+            if (!raiseOnInputDown && !Interactable.IsGrabbed)
+            {
+                Click?.Invoke();
+            }
+        }
+
+        /// <inheritdoc/>
+        protected override void OnFirstGrabEntered(InteractionEventArgs eventArgs)
+        {
+            if (raiseOnInputDown && !Interactable.IsSelected)
+            {
+                Click?.Invoke();
+            }
+        }
+
+        /// <inheritdoc/>
+        protected override void OnLastGrabExited(InteractionExitEventArgs eventArgs)
+        {
+            if (!raiseOnInputDown && !Interactable.IsSelected)
             {
                 Click?.Invoke();
             }

diff --git a/Runtime/Input/InteractionBehaviours/ToggleBehaviour.cs b/Runtime/Input/InteractionBehaviours/ToggleBehaviour.cs
@@ -61,18 +61,36 @@ public bool IsOn
         public void SetIsOnWithoutNotify(bool isOn) => this.isOn = isOn;
 
         /// <inheritdoc/>
-        protected override void OnSelectEntered(InteractionEventArgs eventArgs)
+        protected override void OnFirstSelectEntered(InteractionEventArgs eventArgs)
         {
-            if (raiseOnInputDown)
+            if (raiseOnInputDown && !Interactable.IsGrabbed)
             {
                 IsOn = !IsOn;
             }
         }
 
         /// <inheritdoc/>
-        protected override void OnSelectExited(InteractionExitEventArgs eventArgs)
+        protected override void OnLastSelectExited(InteractionExitEventArgs eventArgs)
         {
-            if (!raiseOnInputDown)
+            if (!raiseOnInputDown && !Interactable.IsGrabbed)
+            {
+                IsOn = !IsOn;
+            }
+        }
+
+        /// <inheritdoc/>
+        protected override void OnFirstGrabEntered(InteractionEventArgs eventArgs)
+        {
+            if (raiseOnInputDown && !Interactable.IsSelected)
+            {
+                IsOn = !IsOn;
+            }
+        }
+
+        /// <inheritdoc/>
+        protected override void OnLastGrabExited(InteractionExitEventArgs eventArgs)
+        {
+            if (!raiseOnInputDown && !Interactable.IsSelected)
             {
                 IsOn = !IsOn;
             }