Merge pull request De-Panther#276 from De-Panther/fix_subsystemregistration

Fix SubsystemRegistration not exist after xr.management version 4.3.1

Author: De-Panther

Packages/webxr/CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - Issues when using more than one WebXRManager components.
+- Missing SubsystemRegistration when using newer versions of Unity XR Management package.
 
 ## [0.16.0] - 2023-02-02
 ### Added

Packages/webxr/Runtime/Scripts/WebXRManager.cs

@@ -11,7 +11,11 @@ public enum WebXRVisibilityState
   }
 
   [DefaultExecutionOrder(-2020)]
+  #if UNITY_XR_MANAGEMENT_4_3_1_OR_NEWER
+  public class WebXRManager : SubsystemLifecycleManager<WebXRSubsystem, WebXRSubsystemDescriptor, WebXRSubsystemProvider>
+  #else
   public class WebXRManager : SubsystemLifecycleManager<WebXRSubsystem, WebXRSubsystemDescriptor>
+  #endif
   {
     private static readonly Rect defaultRect = new Rect(0, 0, 1, 1);
 

Packages/webxr/Runtime/WebXR.asmdef

@@ -1,5 +1,6 @@
 {
     "name": "WebXR",
+    "rootNamespace": "",
     "references": [
         "Unity.XR.Management",
         "Unity.Subsystem.Registration"
@@ -11,6 +12,12 @@
     "precompiledReferences": [],
     "autoReferenced": false,
     "defineConstraints": [],
-    "versionDefines": [],
+    "versionDefines": [
+        {
+            "name": "com.unity.xr.management",
+            "expression": "4.3.1",
+            "define": "UNITY_XR_MANAGEMENT_4_3_1_OR_NEWER"
+        }
+    ],
     "noEngineReferences": false
 }

Packages/webxr/Runtime/XRPlugin/WebXRSubsystem.cs

@@ -1,21 +1,54 @@
-using System;
 using System.Runtime.InteropServices;
 using AOT;
 using UnityEngine;
+#if UNITY_XR_MANAGEMENT_4_3_1_OR_NEWER
+using UnityEngine.SubsystemsImplementation;
+#endif
 
 namespace WebXR
 {
   // TODO: we need an XRInputSubsystem implementation - this can only be done via native code
 
+#if UNITY_XR_MANAGEMENT_4_3_1_OR_NEWER
+  public abstract class WebXRSubsystemProvider : SubsystemProvider<WebXRSubsystem> { }
+
+  public class WebXRSubsystemDescriptor : SubsystemDescriptorWithProvider<WebXRSubsystem, WebXRSubsystemProvider>
+  {
+    public WebXRSubsystemDescriptor()
+    {
+      providerType = typeof(WebXRSubsystem.Provider);
+    }
+  }
+#else
   public class WebXRSubsystemDescriptor : SubsystemDescriptor<WebXRSubsystem>
   {
   }
+#endif
 
+#if UNITY_XR_MANAGEMENT_4_3_1_OR_NEWER
+  public class WebXRSubsystem : SubsystemWithProvider<WebXRSubsystem, WebXRSubsystemDescriptor, WebXRSubsystemProvider>
+#else
   public class WebXRSubsystem : Subsystem<WebXRSubsystemDescriptor>
+#endif
   {
+#if UNITY_XR_MANAGEMENT_4_3_1_OR_NEWER
+    public class Provider : WebXRSubsystemProvider
+    {
+      public override void Start() { }
+      public override void Stop() { }
+      public override void Destroy() { }
+    }
+#endif
+
     [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
     private static void RegisterDescriptor()
     {
+#if UNITY_XR_MANAGEMENT_4_3_1_OR_NEWER
+      SubsystemDescriptorStore.RegisterDescriptor(new WebXRSubsystemDescriptor()
+      {
+        id = typeof(WebXRSubsystem).FullName
+      });
+#else
       var res = SubsystemRegistration.CreateDescriptor(new WebXRSubsystemDescriptor()
       {
         id = typeof(WebXRSubsystem).FullName,
@@ -24,8 +57,18 @@ private static void RegisterDescriptor()
       if (res)
         Debug.Log("Registered " + nameof(WebXRSubsystemDescriptor));
       else Debug.Log("Failed registering " + nameof(WebXRSubsystemDescriptor));
+#endif
     }
 
+#if UNITY_XR_MANAGEMENT_4_3_1_OR_NEWER
+    protected override void OnStart()
+    {
+      if (Instance != null) return;
+      Debug.Log("Start " + nameof(WebXRSubsystem));
+      Instance = this;
+      InternalStart();
+    }
+#else
     public override void Start()
     {
       if (running) return;
@@ -34,22 +77,41 @@ public override void Start()
       Instance = this;
       InternalStart();
     }
+#endif
 
+#if UNITY_XR_MANAGEMENT_4_3_1_OR_NEWER
+    protected override void OnStop()
+    {
+      if (Instance == null) return;
+      Debug.Log("Stop " + nameof(WebXRSubsystem));
+      Instance = null;
+    }
+#else
     public override void Stop()
     {
       if (!_running) return;
       Debug.Log("Stop " + nameof(WebXRSubsystem));
       _running = false;
       Instance = null;
     }
+#endif
 
+#if UNITY_XR_MANAGEMENT_4_3_1_OR_NEWER
+    protected override void OnDestroy()
+    {
+      if (Instance == null) return;
+      Debug.Log("Destroy " + nameof(WebXRSubsystem));
+      Instance = null;
+    }
+#else
     protected override void OnDestroy()
     {
       if (!running) return;
       Debug.Log("Destroy " + nameof(WebXRSubsystem));
       _running = false;
       Instance = null;
     }
+#endif
 
     private void UpdateControllersOnEnd()
     {
@@ -161,8 +223,10 @@ private void UpdateXRCameras()
       }
     }
 
+#if !UNITY_XR_MANAGEMENT_4_3_1_OR_NEWER
     private bool _running;
     public override bool running => _running;
+#endif
 
     private static WebXRSubsystem Instance;
 
@@ -570,4 +634,4 @@ bool GetHitTestPoseFromViewerHitTestPoseArray(ref WebXRHitPoseData hitPoseData)
       return true;
     }
   }
-}
+}

Packages/webxr/Runtime/XRPlugin/XRSystemLifecycleManager.cs

@@ -2,11 +2,22 @@
 using UnityEngine;
 using UnityEngine.XR.Management;
 
+#if UNITY_XR_MANAGEMENT_4_3_1_OR_NEWER
+using UnityEngine.SubsystemsImplementation;
+#endif
+
 namespace WebXR
 {
+#if UNITY_XR_MANAGEMENT_4_3_1_OR_NEWER
+    public class SubsystemLifecycleManager<TSubsystem, TSubsystemDescriptor,TProvider> : MonoBehaviour
+        where TSubsystem : SubsystemWithProvider<TSubsystem, TSubsystemDescriptor,TProvider>, new()
+        where TSubsystemDescriptor : SubsystemDescriptorWithProvider
+        where TProvider : SubsystemProvider<TSubsystem>
+#else
     public class SubsystemLifecycleManager<TSubsystem, TSubsystemDescriptor> : MonoBehaviour
         where TSubsystem : Subsystem<TSubsystemDescriptor>
         where TSubsystemDescriptor : SubsystemDescriptor<TSubsystem>
+#endif
     {
         /// <summary>
         /// Get the <c>TSubsystem</c> whose lifetime this component manages.