Toggle XR from Unity

Added ToggleAR, ToggleVR, isSupportedAR and isSupportedVR to WebXRManager.
Changed WebXRDisplayCapabilities class to struct.
Removed hasExternalDisplay from WebXRDisplayCapabilities.

Author: De-Panther

Packages/webxr/CHANGELOG.md

@@ -5,6 +5,14 @@ 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
+- ToggleAR, ToggleVR, isSupportedAR and isSupportedVR to WebXRManager.
+
+### Changed
+- WebXRDisplayCapabilities class to struct.
+
+### Removed
+- hasExternalDisplay from WebXRDisplayCapabilities.
 
 ## [0.7.0] - 2020-02-13
 ### Added

Packages/webxr/Runtime/Plugins/WebGL/webxr.jslib

@@ -30,6 +30,14 @@ mergeInto(LibraryManager.library, {
     Module.ViewerHitTestPoseArray = new Float32Array(buffer, byteOffset, length);
   },
 
+  ToggleAR: function() {
+    document.dispatchEvent(new CustomEvent('toggleAR', {}));
+  },
+
+  ToggleVR: function() {
+    document.dispatchEvent(new CustomEvent('toggleVR', {}));
+  },
+
   ToggleViewerHitTest: function() {
     document.dispatchEvent(new CustomEvent('toggleHitTest', {}));
   },

Packages/webxr/Runtime/Plugins/WebGL/webxr.jspre

@@ -578,8 +578,7 @@ setTimeout(function () {
         this.gameModule.WebXR.OnXRCapabilities(
           JSON.stringify({
             canPresentAR: this.isARSupported,
-            canPresentVR: this.isVRSupported,
-            hasExternalDisplay: false // TODO: check this
+            canPresentVR: this.isVRSupported
           })
         );
       }

Packages/webxr/Runtime/Scripts/WebXRDisplayCapabilities.cs

@@ -1,10 +1,9 @@
 namespace WebXR
 {
   [System.Serializable]
-  public class WebXRDisplayCapabilities
+  public struct WebXRDisplayCapabilities
   {
     public bool canPresentAR;
     public bool canPresentVR;
-    public bool hasExternalDisplay;
   }
 }

Packages/webxr/Runtime/Scripts/WebXRManager.cs

@@ -43,7 +43,33 @@ public static event WebXRSubsystem.HitTestUpdate OnViewerHitTestUpdate
           add => WebXRSubsystem.OnViewerHitTestUpdate += value;
           remove => WebXRSubsystem.OnViewerHitTestUpdate -= value;
       }
-      
+
+      public bool isSupportedAR
+      {
+        get
+        {
+          return subsystem.capabilities.canPresentAR;
+        }
+      }
+
+      public bool isSupportedVR
+      {
+        get
+        {
+          return subsystem.capabilities.canPresentVR;
+        }
+      }
+
+      public void ToggleAR()
+      {
+          subsystem.ToggleAR();
+      }
+
+      public void ToggleVR()
+      {
+          subsystem.ToggleVR();
+      }
+
       public void HapticPulse(WebXRControllerHand hand, float intensity, float duration)
       {
           subsystem.HapticPulse(hand, intensity, duration);

Packages/webxr/Runtime/XRPlugin/WebXRSubsystem.cs

@@ -180,6 +180,12 @@ private static class Native
       [DllImport("__Internal")]
       public static extern void InitViewerHitTestPoseArray(float[] array, int length);
 
+      [DllImport("__Internal")]
+      public static extern void ToggleAR();
+
+      [DllImport("__Internal")]
+      public static extern void ToggleVR();
+
       [DllImport("__Internal")]
       public static extern void ToggleViewerHitTest();
 
@@ -262,7 +268,7 @@ public delegate void HeadsetUpdate(
 
     private WebXRHitPoseData viewerHitTestPose = new WebXRHitPoseData();
 
-    private WebXRDisplayCapabilities capabilities = new WebXRDisplayCapabilities();
+    internal WebXRDisplayCapabilities capabilities = new WebXRDisplayCapabilities();
 
     // Handles WebXR capabilities from browser
     [MonoPInvokeCallback(typeof(Action<string>))]
@@ -328,6 +334,22 @@ public static void OnEndXR()
       Instance.setXrState(WebXRState.NORMAL, 1, new Rect(), new Rect());
     }
 
+    public void ToggleAR()
+    {
+      if (capabilities.canPresentAR)
+      {
+        Native.ToggleAR();
+      }
+    }
+
+    public void ToggleVR()
+    {
+      if (capabilities.canPresentVR)
+      {
+        Native.ToggleVR();
+      }
+    }
+
     public void StartViewerHitTest()
     {
       if (xrState == WebXRState.AR && !viewerHitTestOn)