Merge pull request #360 from De-Panther/performance_allow_disable_xrd…

…isplaysubsystem

Allow to use BiRP and allow to not use XRDisplaySubsystem

DebugProjects/Unity2020.3-BiRP/Assets/WebXR/Samples/Desert-BiRP

@@ -0,0 +1 @@
+../../../../../Packages/webxr-interactions/Samples~/Desert-BiRP

DebugProjects/Unity2020.3-BiRP/Assets/XR/Settings/Web XR Settings.asset

@@ -0,0 +1,24 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fc85f61fbfe6db9419f177419a072d26, type: 3}
+  m_Name: Web XR Settings
+  m_EditorClassIdentifier: 
+  VRRequiredReferenceSpace: 2
+  VROptionalFeatures: 2
+  ARRequiredReferenceSpace: 2
+  AROptionalFeatures: -1
+  UseFramebufferScaleFactor: 0
+  UseNativeResolution: 0
+  FramebufferScaleFactor: 1
+  AutoLoadWebXRManager: 1
+  AutoLoadWebXRInputSystem: 0
+  DisableXRDisplaySubsystem: 1

DebugProjects/Unity2022.3/Packages/manifest.json → DebugProjects/Unity2020.3-BiRP/Packages/manifest.json

@@ -1,14 +1,15 @@
 {
   "dependencies": {
-    "com.de-panther.webxr-input-profiles-loader": "0.4.0",
-    "com.unity.ai.navigation": "1.1.3",
-    "com.unity.ide.rider": "3.0.24",
-    "com.unity.ide.visualstudio": "2.0.18",
+    "com.de-panther.webxr-input-profiles-loader": "0.6.2",
+    "com.unity.ide.rider": "2.0.7",
+    "com.unity.ide.visualstudio": "2.0.8",
     "com.unity.ide.vscode": "1.2.5",
-    "com.unity.test-framework": "1.1.33",
+    "com.unity.test-framework": "1.1.24",
+    "com.unity.textmeshpro": "3.0.6",
+    "com.unity.timeline": "1.4.8",
     "com.unity.ugui": "1.0.0",
-    "com.unity.xr.management": "4.3.3",
-    "com.unity.xr.oculus": "4.0.0",
+    "com.unity.xr.management": "4.0.1",
+    "com.unity.xr.oculus": "1.9.1",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
@@ -46,8 +47,7 @@
       "name": "OpenUPM",
       "url": "https://package.openupm.com",
       "scopes": [
-        "com.de-panther",
-        "com.atteneder"
+        "com.de-panther"
       ]
     }
   ]

DebugProjects/Unity2022.3/Packages/packages-lock.json → DebugProjects/Unity2020.3-BiRP/Packages/packages-lock.json

@@ -1,18 +1,5 @@
 {
   "dependencies": {
-    "com.atteneder.gltfast": {
-      "version": "4.4.8",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.modules.jsonserialize": "1.0.0",
-        "com.unity.modules.unitywebrequest": "1.0.0",
-        "com.unity.modules.unitywebrequesttexture": "1.0.0",
-        "com.unity.mathematics": "1.2.1",
-        "com.unity.burst": "1.4.11"
-      },
-      "url": "https://package.openupm.com"
-    },
     "com.de-panther.webxr": {
       "version": "file:webxr",
       "depth": 0,
@@ -22,12 +9,12 @@
       }
     },
     "com.de-panther.webxr-input-profiles-loader": {
-      "version": "0.4.0",
+      "version": "0.6.2",
       "depth": 0,
       "source": "registry",
       "dependencies": {
         "com.unity.nuget.newtonsoft-json": "2.0.0",
-        "com.atteneder.gltfast": "4.4.8"
+        "com.unity.cloud.gltfast": "5.2.0"
       },
       "url": "https://package.openupm.com"
     },
@@ -36,24 +23,27 @@
       "depth": 0,
       "source": "embedded",
       "dependencies": {
-        "com.de-panther.webxr": "0.16.0-preview"
+        "com.de-panther.webxr": "0.21.0"
       }
     },
-    "com.unity.ai.navigation": {
-      "version": "1.1.3",
-      "depth": 0,
+    "com.unity.burst": {
+      "version": "1.6.6",
+      "depth": 2,
       "source": "registry",
       "dependencies": {
-        "com.unity.modules.ai": "1.0.0"
+        "com.unity.mathematics": "1.2.1"
       },
       "url": "https://packages.unity.com"
     },
-    "com.unity.burst": {
-      "version": "1.8.7",
-      "depth": 2,
+    "com.unity.cloud.gltfast": {
+      "version": "5.2.0",
+      "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.mathematics": "1.2.1"
+        "com.unity.modules.jsonserialize": "1.0.0",
+        "com.unity.modules.unitywebrequest": "1.0.0",
+        "com.unity.mathematics": "1.2.6",
+        "com.unity.burst": "1.6.6"
       },
       "url": "https://packages.unity.com"
     },
@@ -65,16 +55,16 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "3.0.24",
+      "version": "2.0.7",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.ext.nunit": "1.0.6"
+        "com.unity.test-framework": "1.1.1"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.18",
+      "version": "2.0.8",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -97,14 +87,21 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.nuget.newtonsoft-json": {
-      "version": "3.2.1",
+      "version": "2.0.0",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.subsystemregistration": {
+      "version": "1.0.6",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
-      "version": "1.1.33",
+      "version": "1.1.24",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -114,6 +111,27 @@
       },
       "url": "https://packages.unity.com"
     },
+    "com.unity.textmeshpro": {
+      "version": "3.0.6",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.ugui": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.timeline": {
+      "version": "1.4.8",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.modules.director": "1.0.0",
+        "com.unity.modules.animation": "1.0.0",
+        "com.unity.modules.audio": "1.0.0",
+        "com.unity.modules.particlesystem": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
     "com.unity.ugui": {
       "version": "1.0.0",
       "depth": 0,
@@ -124,7 +142,7 @@
       }
     },
     "com.unity.xr.legacyinputhelpers": {
-      "version": "2.1.10",
+      "version": "2.1.7",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -134,23 +152,25 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.xr.management": {
-      "version": "4.3.3",
+      "version": "4.0.1",
       "depth": 0,
       "source": "registry",
       "dependencies": {
         "com.unity.modules.subsystems": "1.0.0",
         "com.unity.modules.vr": "1.0.0",
         "com.unity.modules.xr": "1.0.0",
-        "com.unity.xr.legacyinputhelpers": "2.1.7"
+        "com.unity.xr.legacyinputhelpers": "2.1.7",
+        "com.unity.subsystemregistration": "1.0.6"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.xr.oculus": {
-      "version": "4.0.0",
+      "version": "1.9.1",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.xr.management": "4.2.0"
+        "com.unity.xr.management": "4.0.1",
+        "com.unity.ugui": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
@@ -286,6 +306,17 @@
       "version": "1.0.0",
       "depth": 0,
       "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.ui": "1.0.0",
+        "com.unity.modules.imgui": "1.0.0",
+        "com.unity.modules.jsonserialize": "1.0.0",
+        "com.unity.modules.uielementsnative": "1.0.0"
+      }
+    },
+    "com.unity.modules.uielementsnative": {
+      "version": "1.0.0",
+      "depth": 1,
+      "source": "builtin",
       "dependencies": {
         "com.unity.modules.ui": "1.0.0",
         "com.unity.modules.imgui": "1.0.0",

DebugProjects/Unity2022.3/ProjectSettings/EditorBuildSettings.asset → DebugProjects/Unity2020.3-BiRP/ProjectSettings/EditorBuildSettings.asset

@@ -5,7 +5,7 @@ EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Scenes:
-  - enabled: 1
+  - enabled: 0
     path: Assets/WebXR/Samples/Desert/Scenes/Desert.unity
     guid: 85380d4847db7b74a850284461349c36
   m_configObjects:

DebugProjects/Unity2022.3/ProjectSettings/GraphicsSettings.asset → DebugProjects/Unity2020.3-BiRP/ProjectSettings/GraphicsSettings.asset

@@ -28,16 +28,17 @@ GraphicsSettings:
   m_LensFlare:
     m_Mode: 1
     m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0}
+  m_VideoShadersIncludeMode: 2
   m_AlwaysIncludedShaders:
   - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 15105, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
-  m_PreloadedShaders: []
-  m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
-    type: 0}
+  m_PreloadedShaders:
+  - {fileID: 20000000, guid: 14ec05db04ad028438150751d08d01df, type: 2}
+  m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
   m_CustomRenderPipeline: {fileID: 0}
   m_TransparencySortMode: 0
   m_TransparencySortAxis: {x: 0, y: 0, z: 1}
@@ -59,5 +60,5 @@ GraphicsSettings:
   m_AlbedoSwatchInfos: []
   m_LightsUseLinearIntensity: 0
   m_LightsUseColorTemperature: 0
+  m_DefaultRenderingLayerMask: 1
   m_LogWhenShaderIsCompiled: 0
-  m_AllowEnlightenSupportForUpgradedProject: 0