2.1.0

Unity-Technologies · Sep 17, 2024 · cd2f913 · cd2f913
1 parent 60300dd
commit cd2f913
Show file tree

Hide file tree

Showing 226 changed files with 13,103 additions and 5,868 deletions.
diff --git a/Project/.gitignore b/Project/.gitignore
@@ -71,3 +71,7 @@ crashlytics-build.properties
 /[Aa]ssets/[Ss]treamingAssets/aa.meta
 /[Aa]ssets/[Ss]treamingAssets/aa/*
 
+# User simulation settings
+Assets/XR/UserSimulationSettings/*
+Assets/XR/UserSimulationSettings.meta
+
diff --git a/.../UnityXRContent/ARFoundation/SimulationEnvironments/Backyard/Prefab/Bar_72in_BY001.prefab b/.../UnityXRContent/ARFoundation/SimulationEnvironments/Backyard/Prefab/Bar_72in_BY001.prefab
@@ -5,8 +5,14 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: -4216859302048453862, guid: dfdb096020185ef4f8541f9e3e73911b,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: -4216859302048453862, guid: dfdb096020185ef4f8541f9e3e73911b,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -22,6 +28,11 @@ PrefabInstance:
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: dfdb096020185ef4f8541f9e3e73911b,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: -4216859302048453862, guid: dfdb096020185ef4f8541f9e3e73911b,
         type: 3}
       propertyPath: m_LocalRotation.x
@@ -37,16 +48,6 @@ PrefabInstance:
       propertyPath: m_LocalRotation.z
       value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: dfdb096020185ef4f8541f9e3e73911b,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: dfdb096020185ef4f8541f9e3e73911b,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: -4216859302048453862, guid: dfdb096020185ef4f8541f9e3e73911b,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -64,7 +65,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: -1504981713932161579, guid: dfdb096020185ef4f8541f9e3e73911b,
         type: 3}
-      propertyPath: m_Materials.Array.data[0]
+      propertyPath: 'm_Materials.Array.data[0]'
       value: 
       objectReference: {fileID: 2100000, guid: bdb4f0e72d599d24e9d023a50c9be9f4, type: 2}
     - target: {fileID: -927199367670048503, guid: dfdb096020185ef4f8541f9e3e73911b,
@@ -73,4 +74,32 @@ PrefabInstance:
       value: Bar_72in_BY001
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: -927199367670048503, guid: dfdb096020185ef4f8541f9e3e73911b,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 8159418334527920034}
   m_SourcePrefab: {fileID: 100100000, guid: dfdb096020185ef4f8541f9e3e73911b, type: 3}
+--- !u!1 &8277755204460947028 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: dfdb096020185ef4f8541f9e3e73911b,
+    type: 3}
+  m_PrefabInstance: {fileID: 126544537761251165}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &8159418334527920034
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8277755204460947028}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f3f648ab7bfdc5b4b85349b78470080b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Size: {x: 1.8656135, y: 1.0653781, z: 0.7799355}
+  m_Center: {x: 0, y: 0.5326, z: 0}
+  m_Classifications: 64
diff --git a/...nityXRContent/ARFoundation/SimulationEnvironments/Backyard/Prefab/Chair_34in_BY001.prefab b/...nityXRContent/ARFoundation/SimulationEnvironments/Backyard/Prefab/Chair_34in_BY001.prefab
@@ -5,6 +5,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
     - target: {fileID: -4216859302048453862, guid: 9be7587cbe2d7bf48a8f4baf79ec0d0a,
@@ -64,7 +65,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: -1504981713932161579, guid: 9be7587cbe2d7bf48a8f4baf79ec0d0a,
         type: 3}
-      propertyPath: m_Materials.Array.data[0]
+      propertyPath: 'm_Materials.Array.data[0]'
       value: 
       objectReference: {fileID: 2100000, guid: bdb4f0e72d599d24e9d023a50c9be9f4, type: 2}
     - target: {fileID: -927199367670048503, guid: 9be7587cbe2d7bf48a8f4baf79ec0d0a,
@@ -73,6 +74,17 @@ PrefabInstance:
       value: Chair_34in_BY001
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: -927199367670048503, guid: 9be7587cbe2d7bf48a8f4baf79ec0d0a,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 9068161897509495243}
+    - targetCorrespondingSourceObject: {fileID: -927199367670048503, guid: 9be7587cbe2d7bf48a8f4baf79ec0d0a,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 8903184783700003226}
   m_SourcePrefab: {fileID: 100100000, guid: 9be7587cbe2d7bf48a8f4baf79ec0d0a, type: 3}
 --- !u!1 &5584237220505030643 stripped
 GameObject:
@@ -93,3 +105,18 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_ClassificationType: seat
+--- !u!114 &8903184783700003226
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5584237220505030643}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f3f648ab7bfdc5b4b85349b78470080b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Size: {x: 0.60341287, y: 0.86360013, z: 0.7027365}
+  m_Center: {x: 7.56979e-10, y: 0.43180007, z: -0.000077068806}
+  m_Classifications: 2147483648
diff --git a/...nt/ARFoundation/SimulationEnvironments/Backyard/Prefab/Chair_Adirondack_36in_BY001.prefab b/...nt/ARFoundation/SimulationEnvironments/Backyard/Prefab/Chair_Adirondack_36in_BY001.prefab
@@ -5,6 +5,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
     - target: {fileID: -4216859302048453862, guid: 84567d479d2043646a30fe47b1bfb794,
@@ -64,7 +65,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: -1504981713932161579, guid: 84567d479d2043646a30fe47b1bfb794,
         type: 3}
-      propertyPath: m_Materials.Array.data[0]
+      propertyPath: 'm_Materials.Array.data[0]'
       value: 
       objectReference: {fileID: 2100000, guid: bdb4f0e72d599d24e9d023a50c9be9f4, type: 2}
     - target: {fileID: -927199367670048503, guid: 84567d479d2043646a30fe47b1bfb794,
@@ -73,6 +74,17 @@ PrefabInstance:
       value: Chair_Adirondack_36in_BY001
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: -927199367670048503, guid: 84567d479d2043646a30fe47b1bfb794,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: -5837118784011426322}
+    - targetCorrespondingSourceObject: {fileID: -927199367670048503, guid: 84567d479d2043646a30fe47b1bfb794,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 6278564289428995874}
   m_SourcePrefab: {fileID: 100100000, guid: 84567d479d2043646a30fe47b1bfb794, type: 3}
 --- !u!1 &6702508929665859708 stripped
 GameObject:
@@ -93,3 +105,18 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_ClassificationType: seat
+--- !u!114 &6278564289428995874
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6702508929665859708}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f3f648ab7bfdc5b4b85349b78470080b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Size: {x: 0.7681291, y: 1.0387827, z: 0.957531}
+  m_Center: {x: 0, y: 0.51947385, z: 0.000000059604645}
+  m_Classifications: 2147483648
diff --git a/...Content/ARFoundation/SimulationEnvironments/Backyard/Prefab/Chair_Patio_34in_BY001.prefab b/...Content/ARFoundation/SimulationEnvironments/Backyard/Prefab/Chair_Patio_34in_BY001.prefab
@@ -5,11 +5,12 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
     - target: {fileID: -6589414322517681379, guid: ab61084aca18ff942a67494ccb321b30,
         type: 3}
-      propertyPath: m_Materials.Array.data[0]
+      propertyPath: 'm_Materials.Array.data[0]'
       value: 
       objectReference: {fileID: 2100000, guid: bdb4f0e72d599d24e9d023a50c9be9f4, type: 2}
     - target: {fileID: -4216859302048453862, guid: ab61084aca18ff942a67494ccb321b30,
@@ -74,11 +75,43 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5782366595723067428, guid: ab61084aca18ff942a67494ccb321b30,
         type: 3}
-      propertyPath: m_Materials.Array.data[0]
+      propertyPath: 'm_Materials.Array.data[0]'
       value: 
       objectReference: {fileID: 2100000, guid: bdb4f0e72d599d24e9d023a50c9be9f4, type: 2}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: -927199367670048503, guid: ab61084aca18ff942a67494ccb321b30,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1090988221296886703}
+    - targetCorrespondingSourceObject: {fileID: -8238624214669490486, guid: ab61084aca18ff942a67494ccb321b30,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 5405165749173089628}
   m_SourcePrefab: {fileID: 100100000, guid: ab61084aca18ff942a67494ccb321b30, type: 3}
+--- !u!1 &1724438212877984411 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: -8238624214669490486, guid: ab61084aca18ff942a67494ccb321b30,
+    type: 3}
+  m_PrefabInstance: {fileID: 1892894506429326417}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &5405165749173089628
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1724438212877984411}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f3f648ab7bfdc5b4b85349b78470080b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Size: {x: 0.2535201, y: 0.34491274, z: 0.24985284}
+  m_Center: {x: -0.0001586915, y: 0.17245637, z: -0.0000000117331975}
+  m_Classifications: 2147483648
 --- !u!1 &7594481363740097880 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: ab61084aca18ff942a67494ccb321b30,

diff --git a/...Content/ARFoundation/SimulationEnvironments/Backyard/Prefab/Chair_Patio_34in_BY002.prefab b/...Content/ARFoundation/SimulationEnvironments/Backyard/Prefab/Chair_Patio_34in_BY002.prefab
@@ -5,6 +5,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
     - target: {fileID: -4216859302048453862, guid: 222330ee07ea132438f59d540d06482e,
@@ -69,16 +70,48 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: -497815522635240243, guid: 222330ee07ea132438f59d540d06482e,
         type: 3}
-      propertyPath: m_Materials.Array.data[0]
+      propertyPath: 'm_Materials.Array.data[0]'
       value: 
       objectReference: {fileID: 2100000, guid: bdb4f0e72d599d24e9d023a50c9be9f4, type: 2}
     - target: {fileID: 1478186380236901994, guid: 222330ee07ea132438f59d540d06482e,
         type: 3}
-      propertyPath: m_Materials.Array.data[0]
+      propertyPath: 'm_Materials.Array.data[0]'
       value: 
       objectReference: {fileID: 2100000, guid: bdb4f0e72d599d24e9d023a50c9be9f4, type: 2}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: -927199367670048503, guid: 222330ee07ea132438f59d540d06482e,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: -6878580378721159388}
+    - targetCorrespondingSourceObject: {fileID: -6523593283258193212, guid: 222330ee07ea132438f59d540d06482e,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 2725900381662029246}
   m_SourcePrefab: {fileID: 100100000, guid: 222330ee07ea132438f59d540d06482e, type: 3}
+--- !u!1 &1181142328695938481 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: -6523593283258193212, guid: 222330ee07ea132438f59d540d06482e,
+    type: 3}
+  m_PrefabInstance: {fileID: 3824621271218141045}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &2725900381662029246
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1181142328695938481}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f3f648ab7bfdc5b4b85349b78470080b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Size: {x: 0.2535201, y: 0.34491274, z: 0.1977512}
+  m_Center: {x: -0.0001586915, y: 0.17245637, z: -0.00000003519959}
+  m_Classifications: 2147483648
 --- !u!1 &5058146967462571644 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 222330ee07ea132438f59d540d06482e,

diff --git a/...Content/ARFoundation/SimulationEnvironments/Backyard/Prefab/CoffeeTable_48in_BY001.prefab b/...Content/ARFoundation/SimulationEnvironments/Backyard/Prefab/CoffeeTable_48in_BY001.prefab
@@ -5,6 +5,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
     - target: {fileID: -4216859302048453862, guid: 27951f062805422409edb0e05718e7c0,
@@ -64,7 +65,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: -1504981713932161579, guid: 27951f062805422409edb0e05718e7c0,
         type: 3}
-      propertyPath: m_Materials.Array.data[0]
+      propertyPath: 'm_Materials.Array.data[0]'
       value: 
       objectReference: {fileID: 2100000, guid: bdb4f0e72d599d24e9d023a50c9be9f4, type: 2}
     - target: {fileID: -927199367670048503, guid: 27951f062805422409edb0e05718e7c0,
@@ -73,6 +74,17 @@ PrefabInstance:
       value: CoffeeTable_48in_BY001
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: -927199367670048503, guid: 27951f062805422409edb0e05718e7c0,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 3486563341322892362}
+    - targetCorrespondingSourceObject: {fileID: -927199367670048503, guid: 27951f062805422409edb0e05718e7c0,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 177379850761665785}
   m_SourcePrefab: {fileID: 100100000, guid: 27951f062805422409edb0e05718e7c0, type: 3}
 --- !u!1 &2546247285709431487 stripped
 GameObject:
@@ -93,3 +105,18 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_ClassificationType: table
+--- !u!114 &177379850761665785
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2546247285709431487}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f3f648ab7bfdc5b4b85349b78470080b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Size: {x: 1.2314405, y: 0.46390885, z: 0.61895144}
+  m_Center: {x: 0, y: 0.22842062, z: 0}
+  m_Classifications: 2