Add instructions for WebXR, add XR Hands and sample to required list …

…for XRI, add shader graph to main package dependencies

Unity/Assets/Ubiq/Editor/XRI/ImportHelperXRI.cs

@@ -7,7 +7,7 @@ public static void Import()
 #if XRI_2_5_3_OR_NEWER && XRI_0_0_0_OR_NEWER
     #if !UBIQ_SILENCEWARNING_XRIVERSION
             Debug.LogWarning(
-                "Ubiq sample DemoScene (XRI) requires XRI = 2.5.2, but a" +
+                "Ubiq samples require XRI = 2.5.2, but a" +
                 " different version is installed. The sample may not work" +
                 " correctly. To silence this warning, add the string" +
                 " UBIQ_SILENCEWARNING_XRIVERSION to your scripting define" +
@@ -17,9 +17,11 @@ public static void Import()
 
 #if !XRI_0_0_0_OR_NEWER
             PackageManagerHelper.AddPackage("com.unity.xr.interaction.toolkit@2.5.2");
+            PackageManagerHelper.AddPackage("com.unity.xr.hands@1.3.0");
 #else
             PackageManagerHelper.RequireSample("com.unity.xr.interaction.toolkit","Starter Assets");
             PackageManagerHelper.RequireSample("com.unity.xr.interaction.toolkit","XR Device Simulator");
+            PackageManagerHelper.RequireSample("com.unity.xr.hands","HandVisualizer");
 #endif
         }
     }

Unity/Assets/Ubiq/Runtime/Prefabs/Player (XRI + WebXR).prefab → Unity/Assets/Ubiq/Samples/Player (XRI + WebXR)/Base/DO-NOT-USE-Player (XRI + WebXR).prefab

@@ -1,5 +1,62 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1943765233807183756
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1701463797403052595}
+  - component: {fileID: 8597768159304925931}
+  - component: {fileID: 5009444465387281314}
+  m_Layer: 0
+  m_Name: WebXR Manager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1701463797403052595
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1943765233807183756}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5284493266472358850}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &8597768159304925931
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1943765233807183756}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30257f473861cfd4a9269b5bf4020e6c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &5009444465387281314
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1943765233807183756}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 519f6ee6510174b44bbe9a8a2d3b6a6a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &596350835118790309
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -137,6 +194,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 104277457138784657, guid: 1644f8f6d950f87408375866a875e80d,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -2.25
+      objectReference: {fileID: 0}
     - target: {fileID: 504114868171495443, guid: 1644f8f6d950f87408375866a875e80d,
         type: 3}
       propertyPath: m_CameraYOffset
@@ -145,7 +207,42 @@ PrefabInstance:
     - target: {fileID: 865075385244835223, guid: 1644f8f6d950f87408375866a875e80d,
         type: 3}
       propertyPath: m_Name
-      value: Player (XRI + WebXR)
+      value: DO-NOT-USE-Player (XRI + WebXR)
+      objectReference: {fileID: 0}
+    - target: {fileID: 1631729514290618539, guid: 1644f8f6d950f87408375866a875e80d,
+        type: 3}
+      propertyPath: m_ModelParent
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 1631729514290618539, guid: 1644f8f6d950f87408375866a875e80d,
+        type: 3}
+      propertyPath: m_ModelPrefab
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 1631729516010397771, guid: 1644f8f6d950f87408375866a875e80d,
+        type: 3}
+      propertyPath: m_ModelParent
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 1631729516010397771, guid: 1644f8f6d950f87408375866a875e80d,
+        type: 3}
+      propertyPath: m_ModelPrefab
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 1631729516037905644, guid: 1644f8f6d950f87408375866a875e80d,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 1.36144
+      objectReference: {fileID: 0}
+    - target: {fileID: 6638533983739928939, guid: 1644f8f6d950f87408375866a875e80d,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6638533983739928939, guid: 1644f8f6d950f87408375866a875e80d,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6662661325109731833, guid: 1644f8f6d950f87408375866a875e80d,
         type: 3}
@@ -156,6 +253,10 @@ PrefabInstance:
     - {fileID: 8439378141309708743, guid: 1644f8f6d950f87408375866a875e80d, type: 3}
     m_RemovedGameObjects: []
     m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 5773256366622995465, guid: 1644f8f6d950f87408375866a875e80d,
+        type: 3}
+      insertIndex: 0
+      addedObject: {fileID: 1701463797403052595}
     - targetCorrespondingSourceObject: {fileID: 5773256366622995465, guid: 1644f8f6d950f87408375866a875e80d,
         type: 3}
       insertIndex: -1

Unity/Assets/Ubiq/Samples/Player (XRI + WebXR)/Base/README.md

@@ -0,0 +1,5 @@
+We suggest you DO NOT use the base prefab in this folder. 
+
+Instead, use the variant in the folder above, and replace/overwrite this base prefab when updating Ubiq.
+
+The changes you have made in your variant will then be re-applied to the updated base. This means as long as the base prefab has not changed too much, you'll be able to update your prefab too!