Merge pull request #154 from De-Panther/option_use_colliders_for_hand_joints

Added an option to disable/enable useCollidersForHandJoints

Author: De-Panther

Packages/webxr-interactions/CHANGELOG.md

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+- An option to disable/enable useCollidersForHandJoints in ControllerInteraction.
 
 ## [0.10.0] - 2021-05-06
 ### Added

Packages/webxr-interactions/Runtime/Scripts/ControllerInteraction.cs

@@ -22,6 +22,7 @@ public class ControllerInteraction : MonoBehaviour
 
     public Transform handJointPrefab;
     private bool handJointsVisible = false;
+    [SerializeField] private bool useCollidersForHandJoints = true;
 
     [SerializeField] private bool useInputProfile = true;
 
@@ -155,6 +156,37 @@ private void OnTriggerExit(Collider other)
       contactRigidBodies.Remove(other.gameObject.GetComponent<Rigidbody>());
     }
 
+    public void SetUseCollidersForHandJoints(bool value)
+    {
+      useCollidersForHandJoints = value;
+      for (int i = 0; i <= (int)WebXRHandJoint.pinky_finger_tip; i++)
+      {
+        if (handJoints.ContainsKey(i))
+        {
+          var collider = handJoints[i].GetComponent<Collider>();
+          if (collider != null)
+          {
+            collider.enabled = useCollidersForHandJoints;
+          }
+        }
+#if WEBXR_INPUT_PROFILES
+        if (handModelJoints.ContainsKey(i))
+        {
+          var collider = handModelJoints[i].GetComponent<Collider>();
+          if (collider != null)
+          {
+            collider.enabled = useCollidersForHandJoints;
+          }
+        }
+#endif
+      }
+    }
+
+    public bool GetUseCollidersForHandJoints()
+    {
+      return useCollidersForHandJoints;
+    }
+
     public void SetUseInputProfile(bool value)
     {
       useInputProfile = value;
@@ -290,6 +322,11 @@ private void OnHandUpdate(WebXRHandData handData)
           {
             clone.localScale = new Vector3(0.005f, 0.005f, 0.005f);
           }
+          var collider = clone.GetComponent<Collider>();
+          if (collider != null)
+          {
+            collider.enabled = useCollidersForHandJoints;
+          }
           handJoints.Add(i, clone);
           handJointsVisuals[i] = clone.gameObject;
         }
@@ -413,9 +450,12 @@ private void HandleHandModelLoaded(bool success)
           if (handJoints.ContainsKey(i))
           {
             handModelJoints[i].SetPositionAndRotation(handJoints[i].position, handJoints[i].rotation);
-            var collider = handModelJoints[i].gameObject.AddComponent<SphereCollider>();
-            collider.radius = handJoints[i].localScale.x;
-            collider.isTrigger = true;
+            if (useCollidersForHandJoints)
+            {
+              var collider = handModelJoints[i].gameObject.AddComponent<SphereCollider>();
+              collider.radius = handJoints[i].localScale.x;
+              collider.isTrigger = true;
+            }
           }
         }
         if (handJointsVisible)