Updated WebXRCamera and Controller scripts to work with Unity XR Plugin system (non-legacy)

Author: roblkw-asu

Assets/WebXR/Scripts/WebXRCamera.cs

@@ -33,11 +33,11 @@ void OnEnable()
 
             cameraMain.transform.localPosition = new Vector3(0, WebXRManager.Instance.DefaultHeight, 0);
 
-#if UNITY_EDITOR
-			// No editor specific funtionality
-#elif UNITY_WEBGL
-			postRenderCoroutine = StartCoroutine(endOfFrame());
-#endif
+            #if UNITY_EDITOR
+			            // No editor specific funtionality
+            #elif UNITY_WEBGL
+			            postRenderCoroutine = StartCoroutine(endOfFrame());
+            #endif
         }
 
         private void OnDisable()
@@ -81,31 +81,34 @@ private void onHeadsetUpdate(
                 cameraR.projectionMatrix = rightProjectionMatrix;
             }
         }
+
+        //Update Camera position according to Unity XR, if not using WebGL
         private void Update()
         {
-            #if !UNITY_EDITOR
-                        return;
-            #endif
-            InputTracking.GetNodeStates(mNodeStates);
+            List<InputDevice> devices = new List<InputDevice>();
+            InputDevices.GetDevicesWithCharacteristics(InputDeviceCharacteristics.HeadMounted, devices);
+            bool XRisPresent = devices.Count > 0;
+            if (XRisPresent) { 
+                List<XRNodeState> mNodeStates = new List<XRNodeState>();
+                InputTracking.GetNodeStates(mNodeStates);
 
-            foreach (XRNodeState nodeState in mNodeStates)
-            {
-                switch (nodeState.nodeType)
+                Vector3 mHeadPos = Vector3.zero;
+                Quaternion mHeadRot = Quaternion.identity;
+                foreach (XRNodeState nodeState in mNodeStates)
                 {
-                    case XRNode.Head:
-                        nodeState.TryGetPosition(out mHeadPos);
-                        nodeState.TryGetRotation(out mHeadRot);
-                        break;
+                    switch (nodeState.nodeType)
+                    {
+                        case XRNode.Head:
+                            nodeState.TryGetPosition(out mHeadPos);
+                            nodeState.TryGetRotation(out mHeadRot);
+                            break;
 
+                    }
                 }
+                cameraMain.transform.localPosition = mHeadPos;
+                cameraMain.transform.localRotation = mHeadRot.normalized;
             }
-            Head.transform.localPosition = mHeadPos;
-            Head.transform.localRotation = mHeadRot.normalized;
         }
-        public GameObject Head;
-
-        private List<XRNodeState> mNodeStates = new List<XRNodeState>();
-        private Vector3 mHeadPos;
-        private Quaternion mHeadRot;
     }
+
 }

Assets/WebXR/Scripts/WebXRController.cs

@@ -270,14 +270,8 @@ private Vector3 applyArmModel(Vector3 controllerPosition, Quaternion controllerR
 
         bool xr_inited = false;
 
-        //public GameObject Head;
 
-        private List<XRNodeState> mNodeStates = new List<XRNodeState>();
-        private Vector3 mHeadPos;
-        private Quaternion mHeadRot;
-        private Vector3 mHandPos;
-        private Quaternion mHandRot;
-        //roblkw - mod
+        
         void InitXR()
         {
             xr_inited = true;
@@ -290,16 +284,22 @@ void InitXR()
         }
         void Update()
         {
-            #if !UNITY_EDITOR
-                return;
-            #endif
             // Use Unity XR Input when enabled. When using WebXR, updates are performed onControllerUpdate.
-            //if (!XRDevice.isPresent) return;
+            List<InputDevice> devices = new List<InputDevice>();
+            InputDevices.GetDevicesWithCharacteristics(InputDeviceCharacteristics.HeadMounted, devices);
+            bool XRisPresent = devices.Count > 0;
+            if (!XRisPresent) return;
 
             if (!xr_inited) InitXR();
 
             SetVisible(true);
 
+            List<XRNodeState> mNodeStates = new List<XRNodeState>();
+            Vector3 mHeadPos = Vector3.zero;
+            Quaternion mHeadRot = Quaternion.identity;
+            Vector3 mHandPos = Vector3.zero;
+            Quaternion mHandRot = Quaternion.identity;
+
             if (this.hand == WebXRControllerHand.LEFT)
                 handNode = XRNode.LeftHand;
 
@@ -338,15 +338,15 @@ void Update()
             if (this.simulate3dof)
             {
                 _t.localPosition = applyArmModel(
-                    mHeadPos,//InputTracking.GetLocalPosition(XRNode.Head), // we use head position as origin
-                    mHandRot,// InputTracking.GetLocalRotation(handNode);
-                    mHeadRot);//InputTracking.GetLocalRotation(XRNode.Head));
-                _t.localRotation = mHandRot; // InputTracking.GetLocalRotation(handNode);
+                    mHeadPos, // we use head position as origin
+                    mHandRot,
+                    mHeadRot);
+                _t.localRotation = mHandRot;
             }
             else
             {
-                _t.localPosition = mHandPos;// InputTracking.GetLocalPosition(handNode);
-                _t.localRotation = mHandRot;// InputTracking.GetLocalRotation(handNode);
+                _t.localPosition = mHandPos;
+                _t.localRotation = mHandRot;
             }
 
             foreach (WebXRControllerInput input in inputMap.inputs)