Merge pull request #117 from De-Panther/controller_check_onenable

Added isControllerActive and isHandActive to WebXRController

Author: De-Panther

Packages/webxr-interactions/CHANGELOG.md

@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 ### Added
 - Check if hand joints radius changed on hand update in ControllerInteraction.
+- Check if isControllerActive and isHandActive on enable in ControllerInteraction.
 
 ## [0.5.2] - 2020-01-16
 ### Fixed

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

@@ -69,6 +69,14 @@ private void Awake()
 
     private void OnEnable()
     {
+      if (controller.isHandActive)
+      {
+        SetHandJointsVisible(true);
+      }
+      else if (controller.isControllerActive)
+      {
+        SetControllerVisible(true);
+      }
       controller.OnControllerActive += SetControllerVisible;
       controller.OnHandActive += SetHandJointsVisible;
       controller.OnHandUpdate += OnHandUpdate;

Packages/webxr/CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - GetLocalRotation and GetLocalPosition to WebXRCamera.
 - Support for the new/updated WebXR Hands API.
+- isControllerActive and isHandActive to WebXRController.
 
 ### Changed
 - Using `frame.fillPoses` and `frame.fillJointRadii` instead of `frame.getJointPose` for XRHand.

Packages/webxr/Runtime/Scripts/WebXRController.cs

@@ -57,6 +57,22 @@ public enum Axis2DTypes
 
     private string[] profiles = null;
 
+    public bool isControllerActive
+    {
+      get
+      {
+        return controllerActive;
+      }
+    }
+
+    public bool isHandActive
+    {
+      get
+      {
+        return handActive;
+      }
+    }
+
 #if UNITY_EDITOR || !UNITY_WEBGL
     private InputDeviceCharacteristics xrHand = InputDeviceCharacteristics.Controller;
     private InputDevice? inputDevice;