Make the packages work both on Editor and WebGL. Use WebXRSettings for refSpace and features.

Author: De-Panther

Build/Build/Build.data.unityweb

@@ -186,8 +186,8 @@
   XRManager.prototype.onRequestARSession = function () {
     if (!this.isARSupported) return;
     navigator.xr.requestSession('immersive-ar', {
-      requiredFeatures: ['local-floor'], // TODO: Get this value from Unity
-      optionalFeatures: ['hand-tracking', 'hit-test']
+      requiredFeatures: this.gameInstance.Module.WebXR.Settings.ARRequiredReferenceSpace,
+      optionalFeatures: this.gameInstance.Module.WebXR.Settings.AROptionalFeatures
     }).then(async (session) => {
       session.isImmersive = true;
       session.isInSession = true;
@@ -200,8 +200,8 @@
   XRManager.prototype.onRequestVRSession = function () {
     if (!this.isVRSupported) return;
     navigator.xr.requestSession('immersive-vr', {
-      requiredFeatures: ['local-floor'], // TODO: Get this value from Unity
-      optionalFeatures: ['hand-tracking']
+      requiredFeatures: this.gameInstance.Module.WebXR.Settings.VRRequiredReferenceSpace,
+      optionalFeatures: this.gameInstance.Module.WebXR.Settings.VROptionalFeatures
     }).then(async (session) => {
       session.isImmersive = true;
       session.isInSession = true;
@@ -648,7 +648,10 @@
 
     let refSpaceType = 'viewer';
     if (session.isImmersive) {
-      refSpaceType = 'local-floor';
+      refSpaceType = this.gameInstance.Module.WebXR.Settings.VRRequiredReferenceSpace[0];
+      if (session.isAR) {
+        refSpaceType = this.gameInstance.Module.WebXR.Settings.ARRequiredReferenceSpace[0];
+      }
 
       var onSessionEnded = this.onEndSession.bind(this);
       session.addEventListener('end', onSessionEnded);

Build/Build/Build.wasm

@@ -12,3 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fc85f61fbfe6db9419f177419a072d26, type: 3}
   m_Name: Web XR Settings
   m_EditorClassIdentifier: 
+  VRRequiredReferenceSpace: 2
+  VROptionalFeatures: 2
+  ARRequiredReferenceSpace: 2
+  AROptionalFeatures: -1

Build/Build/Build.wasm.framework.unityweb

@@ -4,13 +4,17 @@
       "version": "file:webxr",
       "depth": 0,
       "source": "embedded",
-      "dependencies": {}
+      "dependencies": {
+        "com.unity.xr.management": "3.2.13"
+      }
     },
     "com.de-panther.webxr-interactions": {
       "version": "file:webxr-interactions",
       "depth": 0,
       "source": "embedded",
-      "dependencies": {}
+      "dependencies": {
+        "com.de-panther.webxr": "0.2.0"
+      }
     },
     "com.unity.ext.nunit": {
       "version": "1.0.0",

Build/webxr.js

@@ -128,6 +128,7 @@ PlayerSettings:
   preloadedAssets:
   - {fileID: 2478256764130162806, guid: 552445d583cb06c4eaf9d56596dd45c2, type: 2}
   - {fileID: 11400000, guid: 65eada5edf5f16b4a9d0bd3a76fa026f, type: 2}
+  - {fileID: 11400000, guid: a5e5b7605fb48984988490688c2a74e2, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1

MainProject/Assets/XR/Settings/Web XR Settings.asset

@@ -1,95 +1,97 @@
 using UnityEngine;
 using System.Collections.Generic;
-using WebXR;
 
-public class ControllerInteraction : MonoBehaviour
+namespace WebXR.Interactions
 {
-  private FixedJoint attachJoint = null;
-  private Rigidbody currentRigidBody = null;
-  private List<Rigidbody> contactRigidBodies = new List<Rigidbody>();
-
-  private Animator anim;
-  private WebXRController controller;
-
-  void Awake()
+  public class ControllerInteraction : MonoBehaviour
   {
-    attachJoint = GetComponent<FixedJoint>();
-  }
+    private FixedJoint attachJoint = null;
+    private Rigidbody currentRigidBody = null;
+    private List<Rigidbody> contactRigidBodies = new List<Rigidbody>();
 
-  void Start()
-  {
-    anim = gameObject.GetComponent<Animator>();
-    controller = gameObject.GetComponent<WebXRController>();
-  }
+    private Animator anim;
+    private WebXRController controller;
 
-  void Update()
-  {
-    float normalizedTime = controller.GetButton("Trigger") ? 1 : controller.GetAxis("Grip");
+    void Awake()
+    {
+      attachJoint = GetComponent<FixedJoint>();
+    }
 
-    if (controller.GetButtonDown("Trigger") || controller.GetButtonDown("Grip"))
-      Pickup();
+    void Start()
+    {
+      anim = gameObject.GetComponent<Animator>();
+      controller = gameObject.GetComponent<WebXRController>();
+    }
 
-    if (controller.GetButtonUp("Trigger") || controller.GetButtonUp("Grip"))
-      Drop();
+    void Update()
+    {
+      float normalizedTime = controller.GetButton("Trigger") ? 1 : controller.GetAxis("Grip");
 
-    // Use the controller button or axis position to manipulate the playback time for hand model.
-    anim.Play("Take", -1, normalizedTime);
-  }
+      if (controller.GetButtonDown("Trigger") || controller.GetButtonDown("Grip"))
+        Pickup();
 
-  void OnTriggerEnter(Collider other)
-  {
-    if (other.gameObject.tag != "Interactable")
-      return;
+      if (controller.GetButtonUp("Trigger") || controller.GetButtonUp("Grip"))
+        Drop();
 
-    contactRigidBodies.Add(other.gameObject.GetComponent<Rigidbody>());
-    controller.Pulse(0.5f, 250);
-  }
+      // Use the controller button or axis position to manipulate the playback time for hand model.
+      anim.Play("Take", -1, normalizedTime);
+    }
 
-  void OnTriggerExit(Collider other)
-  {
-    if (other.gameObject.tag != "Interactable")
-      return;
+    void OnTriggerEnter(Collider other)
+    {
+      if (other.gameObject.tag != "Interactable")
+        return;
 
-    contactRigidBodies.Remove(other.gameObject.GetComponent<Rigidbody>());
-  }
+      contactRigidBodies.Add(other.gameObject.GetComponent<Rigidbody>());
+      controller.Pulse(0.5f, 250);
+    }
 
-  public void Pickup()
-  {
-    currentRigidBody = GetNearestRigidBody();
+    void OnTriggerExit(Collider other)
+    {
+      if (other.gameObject.tag != "Interactable")
+        return;
 
-    if (!currentRigidBody)
-      return;
+      contactRigidBodies.Remove(other.gameObject.GetComponent<Rigidbody>());
+    }
 
-    currentRigidBody.MovePosition(transform.position);
-    attachJoint.connectedBody = currentRigidBody;
-  }
+    public void Pickup()
+    {
+      currentRigidBody = GetNearestRigidBody();
 
-  public void Drop()
-  {
-    if (!currentRigidBody)
-      return;
+      if (!currentRigidBody)
+        return;
 
-    attachJoint.connectedBody = null;
-    currentRigidBody = null;
-  }
+      currentRigidBody.MovePosition(transform.position);
+      attachJoint.connectedBody = currentRigidBody;
+    }
 
-  private Rigidbody GetNearestRigidBody()
-  {
-    Rigidbody nearestRigidBody = null;
-    float minDistance = float.MaxValue;
-    float distance = 0.0f;
+    public void Drop()
+    {
+      if (!currentRigidBody)
+        return;
+
+      attachJoint.connectedBody = null;
+      currentRigidBody = null;
+    }
 
-    foreach (Rigidbody contactBody in contactRigidBodies)
+    private Rigidbody GetNearestRigidBody()
     {
-      distance = (contactBody.gameObject.transform.position - transform.position).sqrMagnitude;
+      Rigidbody nearestRigidBody = null;
+      float minDistance = float.MaxValue;
+      float distance = 0.0f;
 
-      if (distance < minDistance)
+      foreach (Rigidbody contactBody in contactRigidBodies)
       {
-        minDistance = distance;
-        nearestRigidBody = contactBody;
+        distance = (contactBody.gameObject.transform.position - transform.position).sqrMagnitude;
+
+        if (distance < minDistance)
+        {
+          minDistance = distance;
+          nearestRigidBody = contactBody;
+        }
       }
-    }
 
-    return nearestRigidBody;
+      return nearestRigidBody;
+    }
   }
 }

MainProject/Packages/packages-lock.json

@@ -1,22 +1,25 @@
 using UnityEngine;
 
-public class FPSCounter : MonoBehaviour
+namespace WebXR.Interactions
 {
-  public TextMesh text;
-  private float fps = 0;
-  private float framesCount = 0;
-  private float lastCheck = 0;
-  private float rate = 0.5f;
-
-  void Update()
+  public class FPSCounter : MonoBehaviour
   {
-    framesCount++;
-    if (Time.time >= lastCheck+rate)
+    public TextMesh text;
+    private float fps = 0;
+    private float framesCount = 0;
+    private float lastCheck = 0;
+    private float rate = 0.5f;
+
+    void Update()
     {
-      fps = framesCount / (Time.time-lastCheck);
-      lastCheck = Time.time;
-      framesCount = 0;
-      text.text = fps.ToString("F0");
+      framesCount++;
+      if (Time.time >= lastCheck + rate)
+      {
+        fps = framesCount / (Time.time - lastCheck);
+        lastCheck = Time.time;
+        framesCount = 0;
+        text.text = fps.ToString("F0");
+      }
     }
   }
 }

MainProject/ProjectSettings/ProjectSettings.asset

@@ -1,65 +1,68 @@
 using UnityEngine;
 
-[RequireComponent(typeof(Rigidbody))]
-public class MouseDragObject : MonoBehaviour
+namespace WebXR.Interactions
 {
-  private Camera currentCamera;
-  private new Rigidbody rigidbody;
-  private Vector3 screenPoint;
-  private Vector3 offset;
-
-  void Awake()
+  [RequireComponent(typeof(Rigidbody))]
+  public class MouseDragObject : MonoBehaviour
   {
-    rigidbody = GetComponent<Rigidbody>();
-  }
+    private Camera currentCamera;
+    private new Rigidbody rigidbody;
+    private Vector3 screenPoint;
+    private Vector3 offset;
 
-  void OnMouseDown()
-  {
-    currentCamera = FindCamera();
-    if (currentCamera != null)
+    void Awake()
     {
-      screenPoint = currentCamera.WorldToScreenPoint(gameObject.transform.position);
-      offset = gameObject.transform.position - currentCamera.ScreenToWorldPoint(GetMousePosWithScreenZ(screenPoint.z));
+      rigidbody = GetComponent<Rigidbody>();
     }
-  }
-
-  void OnMouseUp()
-  {
-    currentCamera = null;
-  }
 
-  void FixedUpdate()
-  {
-    if (currentCamera != null)
+    void OnMouseDown()
     {
-      Vector3 currentScreenPoint = GetMousePosWithScreenZ(screenPoint.z);
-      rigidbody.velocity = Vector3.zero;
-      rigidbody.MovePosition(currentCamera.ScreenToWorldPoint(currentScreenPoint) + offset);
+      currentCamera = FindCamera();
+      if (currentCamera != null)
+      {
+        screenPoint = currentCamera.WorldToScreenPoint(gameObject.transform.position);
+        offset = gameObject.transform.position - currentCamera.ScreenToWorldPoint(GetMousePosWithScreenZ(screenPoint.z));
+      }
     }
-  }
 
-  Vector3 GetMousePosWithScreenZ(float screenZ)
-  {
-    return new Vector3(Input.mousePosition.x, Input.mousePosition.y, screenZ);
-  }
+    void OnMouseUp()
+    {
+      currentCamera = null;
+    }
 
-  Camera FindCamera()
-  {
-    Camera[] cameras = FindObjectsOfType<Camera>();
-    Camera result = null;
-    int camerasSum = 0;
-    foreach (var camera in cameras)
+    void FixedUpdate()
     {
-      if (camera.enabled)
+      if (currentCamera != null)
       {
-        result = camera;
-        camerasSum++;
+        Vector3 currentScreenPoint = GetMousePosWithScreenZ(screenPoint.z);
+        rigidbody.velocity = Vector3.zero;
+        rigidbody.MovePosition(currentCamera.ScreenToWorldPoint(currentScreenPoint) + offset);
       }
     }
-    if (camerasSum > 1)
+
+    Vector3 GetMousePosWithScreenZ(float screenZ)
+    {
+      return new Vector3(Input.mousePosition.x, Input.mousePosition.y, screenZ);
+    }
+
+    Camera FindCamera()
     {
-      result = null;
+      Camera[] cameras = FindObjectsOfType<Camera>();
+      Camera result = null;
+      int camerasSum = 0;
+      foreach (var camera in cameras)
+      {
+        if (camera.enabled)
+        {
+          result = camera;
+          camerasSum++;
+        }
+      }
+      if (camerasSum > 1)
+      {
+        result = null;
+      }
+      return result;
     }
-    return result;
   }
 }