Merge remote-tracking branch 'remotes/origin/master' into fix_subsystemregistration

Author: De-Panther

Packages/webxr/CHANGELOG.md

@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+- Issues when using more than one WebXRManager components.
+
 ## [0.16.0] - 2023-02-02
 ### Added
 - Support for Spectator Camera.

Packages/webxr/Runtime/Scripts/WebXRCamera.cs

@@ -26,16 +26,15 @@ public enum CameraID
 
     private bool hasFollower = false;
 
-    private void Awake()
-    {
-      SwitchXRState();
-    }
-
     private void OnEnable()
     {
       WebXRManager.OnXRChange += OnXRChange;
       WebXRManager.OnHeadsetUpdate += OnHeadsetUpdate;
       hasFollower = cameraFollower != null;
+      OnXRChange(WebXRManager.Instance.XRState,
+                  WebXRManager.Instance.ViewsCount,
+                  WebXRManager.Instance.ViewsLeftRect,
+                  WebXRManager.Instance.ViewsRightRect);
     }
 
     private void OnDisable()

Packages/webxr/Runtime/Scripts/WebXRManager.cs

@@ -17,9 +17,14 @@ public class WebXRManager : SubsystemLifecycleManager<WebXRSubsystem, WebXRSubsy
   public class WebXRManager : SubsystemLifecycleManager<WebXRSubsystem, WebXRSubsystemDescriptor>
   #endif
   {
+    private static readonly Rect defaultRect = new Rect(0, 0, 1, 1);
+
     public static WebXRManager Instance { get; private set; }
 
     public WebXRState XRState => subsystem == null ? WebXRState.NORMAL : subsystem.xrState;
+    public int ViewsCount => subsystem == null ? 1 : subsystem.viewsCount;
+    public Rect ViewsLeftRect => subsystem == null ? defaultRect : subsystem.leftRect;
+    public Rect ViewsRightRect => subsystem == null ? defaultRect : subsystem.rightRect;
 
     public static event WebXRSubsystem.XRCapabilitiesUpdate OnXRCapabilitiesUpdate
     {
@@ -124,6 +129,11 @@ public void StopViewerHitTest()
     protected override void Awake()
     {
       base.Awake();
+      if (Instance != null)
+      {
+        Debug.LogError("More than one WebXRManager components in scene. Disabling previous one.");
+        Instance.enabled = false;
+      }
       Instance = this;
       enabled = subsystem != null;
     }

Packages/webxr/Runtime/XRPlugin/WebXRSubsystem.cs

@@ -271,9 +271,9 @@ public static extern void SetWebXREvents(StartXREvent on_start_ar,
 #endif
 
     internal WebXRState xrState = WebXRState.NORMAL;
-    private int viewsCount = 1;
-    private Rect leftRect;
-    private Rect rightRect;
+    internal int viewsCount = 1;
+    internal Rect leftRect;
+    internal Rect rightRect;
     private bool reportedXRStateSwitch = true;
     internal WebXRVisibilityState visibilityState = WebXRVisibilityState.VISIBLE;
     private bool visibilityStateChanged = false;