Learning how to XR SDK

De-Panther · De-Panther · commit ae549733ce05 · 2020-09-19T03:17:08.000+03:00
diff --git a/MainProject/Assets/XR/Loaders/Web XR Loader.asset b/MainProject/Assets/XR/Loaders/Web XR Loader.asset
@@ -10,5 +10,5 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: b6dc105203eb445fa37284ce6e2e4353, type: 3}
-  m_Name: Web XR Plugin Loader
+  m_Name: Web XR Loader
   m_EditorClassIdentifier: 
diff --git a/MainProject/Assets/XR/Loaders/Web XR Loader.asset.meta b/MainProject/Assets/XR/Loaders/Web XR Loader.asset.meta
diff --git a/MainProject/Assets/XR/Settings/Web XR Settings.asset b/MainProject/Assets/XR/Settings/Web XR Settings.asset
@@ -0,0 +1,14 @@
+%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: 
diff --git a/MainProject/Assets/XR/Settings/Web XR Settings.asset.meta b/MainProject/Assets/XR/Settings/Web XR Settings.asset.meta
diff --git a/MainProject/Assets/XR/XRGeneralSettings.asset b/MainProject/Assets/XR/XRGeneralSettings.asset
@@ -47,7 +47,7 @@ MonoBehaviour:
   m_AutomaticLoading: 0
   m_AutomaticRunning: 0
   m_Loaders:
-  - {fileID: 11400000, guid: 82aa0b958a0a27644821de7237298430, type: 2}
+  - {fileID: 11400000, guid: 934ae9a65b2a12d40aa7dabc95ca4b19, type: 2}
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
diff --git a/MainProject/Packages/manifest.json b/MainProject/Packages/manifest.json
@@ -1,6 +1,5 @@
 {
   "dependencies": {
-    "com.de-panther.webxr": "file:../../Packages/webxr",
     "com.unity.ide.rider": "2.0.5",
     "com.unity.ide.vscode": "1.2.1",
     "com.unity.test-framework": "1.1.16",
diff --git a/MainProject/Packages/packages-lock.json b/MainProject/Packages/packages-lock.json
@@ -1,9 +1,9 @@
 {
   "dependencies": {
     "com.de-panther.webxr": {
-      "version": "file:../../Packages/webxr",
+      "version": "file:webxr",
       "depth": 0,
-      "source": "local",
+      "source": "embedded",
       "dependencies": {}
     },
     "com.unity.ext.nunit": {
diff --git a/MainProject/Packages/webxr b/MainProject/Packages/webxr
@@ -0,0 +1 @@
+../../Packages/webxr
diff --git a/MainProject/ProjectSettings/EditorBuildSettings.asset b/MainProject/ProjectSettings/EditorBuildSettings.asset
@@ -11,5 +11,6 @@ EditorBuildSettings:
   m_configObjects:
     Unity.XR.Oculus.Settings: {fileID: 11400000, guid: 65eada5edf5f16b4a9d0bd3a76fa026f,
       type: 2}
+    WebXR.Settings: {fileID: 11400000, guid: a5e5b7605fb48984988490688c2a74e2, type: 2}
     com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 552445d583cb06c4eaf9d56596dd45c2,
       type: 2}
diff --git a/MainProject/ProjectSettings/ProjectSettings.asset b/MainProject/ProjectSettings/ProjectSettings.asset
@@ -125,7 +125,9 @@ PlayerSettings:
     16:9: 1
     Others: 1
   bundleVersion: 0.1
-  preloadedAssets: []
+  preloadedAssets:
+  - {fileID: 2478256764130162806, guid: 552445d583cb06c4eaf9d56596dd45c2, type: 2}
+  - {fileID: 11400000, guid: 65eada5edf5f16b4a9d0bd3a76fa026f, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
diff --git a/Packages/webxr/Editor/WebXRPackage.cs b/Packages/webxr/Editor/WebXRPackage.cs
@@ -5,34 +5,34 @@
 
 namespace WebXR.Editor
 {
-    internal class XRPackage : IXRPackage
+    internal class WebXRPackage : IXRPackage
     {
-        private class XRPluginSampleLoaderMetadata : IXRLoaderMetadata
+        private class WebXRLoaderMetadata : IXRLoaderMetadata
         {
             public string loaderName { get; set; }
             public string loaderType { get; set; }
             public List<BuildTargetGroup> supportedBuildTargets { get; set; }
         }
 
-        private class XRPluginSampleMetadata : IXRPackageMetadata
+        private class WebXRPackageMetadata : IXRPackageMetadata
         {
             public string packageName { get; set; }
             public string packageId { get; set; }
             public string settingsType { get; set; }
             public List<IXRLoaderMetadata> loaderMetadata { get; set; } 
         }
 
-        static readonly IXRPackageMetadata s_Metadata = new XRPluginSampleMetadata()
+        static readonly IXRPackageMetadata s_Metadata = new WebXRPackageMetadata()
         {
             packageName = "WebXR Export",
             packageId = "com.de-panther.webxr",
-            settingsType = typeof(WebXRPluginLoader).FullName,
+            settingsType = typeof(WebXRSettings).FullName,
             loaderMetadata = new List<IXRLoaderMetadata>() 
             {
-                new XRPluginSampleLoaderMetadata() 
+                new WebXRLoaderMetadata() 
                 {
-                    loaderName = "Web XR Plugin",
-                    loaderType = typeof(WebXRPluginLoader).FullName,
+                    loaderName = "WebXR Export",
+                    loaderType = typeof(WebXRLoader).FullName,
                     supportedBuildTargets = new List<BuildTargetGroup>() 
                     {
                         BuildTargetGroup.WebGL
@@ -45,7 +45,12 @@ private class XRPluginSampleMetadata : IXRPackageMetadata
 
         public bool PopulateNewSettingsInstance(ScriptableObject obj)
         {
-            return true;
+            var settings = obj as WebXRSettings;
+            if (settings != null)
+            {
+                return true;
+            }
+            return false;
         }
     }
 }
diff --git a/Packages/webxr/Editor/WebXRPackage.cs.meta b/Packages/webxr/Editor/WebXRPackage.cs.meta
diff --git a/Packages/webxr/Runtime/XRPlugin/WebXRLoader.cs b/Packages/webxr/Runtime/XRPlugin/WebXRLoader.cs
@@ -4,14 +4,14 @@
 
 namespace WebXR
 {
-    public class WebXRPluginLoader : XRLoaderHelper
+    public class WebXRLoader : XRLoaderHelper
     {
         static readonly List<WebXRSubsystemDescriptor> sampleSubsystemDescriptors = new List<WebXRSubsystemDescriptor>();
         public WebXRSubsystem WebXRSubsystem => GetLoadedSubsystem<WebXRSubsystem>();
         
         public override bool Initialize()
         {
-            Debug.Log("Initialize " + nameof(WebXRPluginLoader));
+            Debug.Log("Initialize " + nameof(WebXRLoader));
             CreateSubsystem<WebXRSubsystemDescriptor, WebXRSubsystem>(sampleSubsystemDescriptors, typeof(WebXRSubsystem).FullName);
             return WebXRSubsystem != null;
         }
diff --git a/Packages/webxr/Runtime/XRPlugin/WebXRLoader.cs.meta b/Packages/webxr/Runtime/XRPlugin/WebXRLoader.cs.meta
diff --git a/Packages/webxr/Runtime/XRPlugin/WebXRSettings.cs b/Packages/webxr/Runtime/XRPlugin/WebXRSettings.cs
@@ -0,0 +1,13 @@
+﻿using UnityEngine;
+using UnityEngine.XR.Management;
+
+namespace WebXR
+{
+  [System.Serializable]
+  [XRConfigurationData("WebXR", "WebXR.Settings")]
+  public class WebXRSettings : ScriptableObject
+  {
+    // Here we'll ask which extra features to try to use
+    // Hand, Hit-Test, Planes, etc...
+  }
+}
diff --git a/Packages/webxr/Runtime/XRPlugin/WebXRSettings.cs.meta b/Packages/webxr/Runtime/XRPlugin/WebXRSettings.cs.meta

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"dependencies": {`
`3`		`- "com.de-panther.webxr": "file:../../Packages/webxr",`
`4`	`3`	`"com.unity.ide.rider": "2.0.5",`
`5`	`4`	`"com.unity.ide.vscode": "1.2.1",`
`6`	`5`	`"com.unity.test-framework": "1.1.16",`