Skip to content

Commit 253cef4

Browse files
RogPodgeRogPodge
authored
Migrated scenes to use the new SceneContent System (#9691)
* Migrated scenes to use the new SceneContent System * typo fix! * serialization corrections
1 parent 4f6c006 commit 253cef4

File tree

43 files changed

+994
-392
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+994
-392
lines changed

‎Assets/MRTK/Examples/Demos/Audio/Scenes/AudioLoFiEffectExamples.unity‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,8 +498,9 @@ GameObject:
498498
serializedVersion: 6
499499
m_Component:
500500
- component: {fileID: 336154624}
501+
- component: {fileID: 336154625}
501502
m_Layer: 0
502-
m_Name: SceneContent
503+
m_Name: MixedRealitySceneContent
503504
m_TagString: Untagged
504505
m_Icon: {fileID: 0}
505506
m_NavMeshLayer: 0
@@ -521,6 +522,19 @@ Transform:
521522
m_Father: {fileID: 0}
522523
m_RootOrder: 3
523524
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
525+
--- !u!114 &336154625
526+
MonoBehaviour:
527+
m_ObjectHideFlags: 0
528+
m_CorrespondingSourceObject: {fileID: 0}
529+
m_PrefabInstance: {fileID: 0}
530+
m_PrefabAsset: {fileID: 0}
531+
m_GameObject: {fileID: 336154623}
532+
m_Enabled: 1
533+
m_EditorHideFlags: 0
534+
m_Script: {fileID: 11500000, guid: c65c9dd2f312b8d41b8849d58e1053fa, type: 3}
535+
m_Name:
536+
m_EditorClassIdentifier:
537+
alignmentType: 0
524538
--- !u!1 &431339710
525539
GameObject:
526540
m_ObjectHideFlags: 0

‎Assets/MRTK/Examples/Demos/Audio/Scenes/AudioOcclusionExamples.unity‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1583,8 +1583,9 @@ GameObject:
15831583
serializedVersion: 6
15841584
m_Component:
15851585
- component: {fileID: 1630808752}
1586+
- component: {fileID: 1630808753}
15861587
m_Layer: 0
1587-
m_Name: SceneContent
1588+
m_Name: MixedRealitySceneContent
15881589
m_TagString: Untagged
15891590
m_Icon: {fileID: 0}
15901591
m_NavMeshLayer: 0
@@ -1607,6 +1608,19 @@ Transform:
16071608
m_Father: {fileID: 0}
16081609
m_RootOrder: 3
16091610
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1611+
--- !u!114 &1630808753
1612+
MonoBehaviour:
1613+
m_ObjectHideFlags: 0
1614+
m_CorrespondingSourceObject: {fileID: 0}
1615+
m_PrefabInstance: {fileID: 0}
1616+
m_PrefabAsset: {fileID: 0}
1617+
m_GameObject: {fileID: 1630808751}
1618+
m_Enabled: 1
1619+
m_EditorHideFlags: 0
1620+
m_Script: {fileID: 11500000, guid: c65c9dd2f312b8d41b8849d58e1053fa, type: 3}
1621+
m_Name:
1622+
m_EditorClassIdentifier:
1623+
alignmentType: 0
16101624
--- !u!1 &1678239840
16111625
GameObject:
16121626
m_ObjectHideFlags: 0

‎Assets/MRTK/Examples/Demos/Audio/Scenes/TextToSpeechExamples.unity‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -759,8 +759,9 @@ GameObject:
759759
serializedVersion: 6
760760
m_Component:
761761
- component: {fileID: 336154624}
762+
- component: {fileID: 336154625}
762763
m_Layer: 0
763-
m_Name: SceneContent
764+
m_Name: MixedRealitySceneContent
764765
m_TagString: Untagged
765766
m_Icon: {fileID: 0}
766767
m_NavMeshLayer: 0
@@ -784,6 +785,19 @@ Transform:
784785
m_Father: {fileID: 0}
785786
m_RootOrder: 3
786787
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
788+
--- !u!114 &336154625
789+
MonoBehaviour:
790+
m_ObjectHideFlags: 0
791+
m_CorrespondingSourceObject: {fileID: 0}
792+
m_PrefabInstance: {fileID: 0}
793+
m_PrefabAsset: {fileID: 0}
794+
m_GameObject: {fileID: 336154623}
795+
m_Enabled: 1
796+
m_EditorHideFlags: 0
797+
m_Script: {fileID: 11500000, guid: c65c9dd2f312b8d41b8849d58e1053fa, type: 3}
798+
m_Name:
799+
m_EditorClassIdentifier:
800+
alignmentType: 0
787801
--- !u!1 &431339710
788802
GameObject:
789803
m_ObjectHideFlags: 0

‎Assets/MRTK/Examples/Demos/Boundary/Scenes/BoundaryVisualizationExample.unity‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1543,8 +1543,9 @@ GameObject:
15431543
serializedVersion: 6
15441544
m_Component:
15451545
- component: {fileID: 1229001242}
1546+
- component: {fileID: 1229001243}
15461547
m_Layer: 0
1547-
m_Name: SceneContent
1548+
m_Name: MixedRealitySceneContent
15481549
m_TagString: Untagged
15491550
m_Icon: {fileID: 0}
15501551
m_NavMeshLayer: 0
@@ -1566,6 +1567,19 @@ Transform:
15661567
m_Father: {fileID: 0}
15671568
m_RootOrder: 3
15681569
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1570+
--- !u!114 &1229001243
1571+
MonoBehaviour:
1572+
m_ObjectHideFlags: 0
1573+
m_CorrespondingSourceObject: {fileID: 0}
1574+
m_PrefabInstance: {fileID: 0}
1575+
m_PrefabAsset: {fileID: 0}
1576+
m_GameObject: {fileID: 1229001241}
1577+
m_Enabled: 1
1578+
m_EditorHideFlags: 0
1579+
m_Script: {fileID: 11500000, guid: c65c9dd2f312b8d41b8849d58e1053fa, type: 3}
1580+
m_Name:
1581+
m_EditorClassIdentifier:
1582+
alignmentType: 0
15691583
--- !u!1 &1285880513
15701584
GameObject:
15711585
m_ObjectHideFlags: 0

‎Assets/MRTK/Examples/Demos/Diagnostics/Scenes/DiagnosticsDemo.unity‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -968,8 +968,9 @@ GameObject:
968968
serializedVersion: 6
969969
m_Component:
970970
- component: {fileID: 797421872}
971+
- component: {fileID: 797421873}
971972
m_Layer: 0
972-
m_Name: SceneContent
973+
m_Name: MixedRealitySceneContent
973974
m_TagString: Untagged
974975
m_Icon: {fileID: 0}
975976
m_NavMeshLayer: 0
@@ -990,6 +991,19 @@ Transform:
990991
m_Father: {fileID: 0}
991992
m_RootOrder: 3
992993
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
994+
--- !u!114 &797421873
995+
MonoBehaviour:
996+
m_ObjectHideFlags: 0
997+
m_CorrespondingSourceObject: {fileID: 0}
998+
m_PrefabInstance: {fileID: 0}
999+
m_PrefabAsset: {fileID: 0}
1000+
m_GameObject: {fileID: 797421871}
1001+
m_Enabled: 1
1002+
m_EditorHideFlags: 0
1003+
m_Script: {fileID: 11500000, guid: c65c9dd2f312b8d41b8849d58e1053fa, type: 3}
1004+
m_Name:
1005+
m_EditorClassIdentifier:
1006+
alignmentType: 0
9931007
--- !u!1 &878628103
9941008
GameObject:
9951009
m_ObjectHideFlags: 0

‎Assets/MRTK/Examples/Demos/EyeTracking/Scenes/EyeTrackingDemo-01-BasicSetup.unity‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1059,8 +1059,9 @@ GameObject:
10591059
serializedVersion: 6
10601060
m_Component:
10611061
- component: {fileID: 895827387}
1062+
- component: {fileID: 895827388}
10621063
m_Layer: 0
1063-
m_Name: SceneContent
1064+
m_Name: MixedRealitySceneContent
10641065
m_TagString: Untagged
10651066
m_Icon: {fileID: 0}
10661067
m_NavMeshLayer: 0
@@ -1084,6 +1085,19 @@ Transform:
10841085
m_Father: {fileID: 0}
10851086
m_RootOrder: 2
10861087
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1088+
--- !u!114 &895827388
1089+
MonoBehaviour:
1090+
m_ObjectHideFlags: 0
1091+
m_CorrespondingSourceObject: {fileID: 0}
1092+
m_PrefabInstance: {fileID: 0}
1093+
m_PrefabAsset: {fileID: 0}
1094+
m_GameObject: {fileID: 895827386}
1095+
m_Enabled: 1
1096+
m_EditorHideFlags: 0
1097+
m_Script: {fileID: 11500000, guid: c65c9dd2f312b8d41b8849d58e1053fa, type: 3}
1098+
m_Name:
1099+
m_EditorClassIdentifier:
1100+
alignmentType: 0
10871101
--- !u!1 &914706308
10881102
GameObject:
10891103
m_ObjectHideFlags: 0

‎Assets/MRTK/Examples/Demos/EyeTracking/Scenes/EyeTrackingDemo-02-TargetSelection.unity‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2400,13 +2400,27 @@ GameObject:
24002400
serializedVersion: 6
24012401
m_Component:
24022402
- component: {fileID: 3555622486023366060}
2403+
- component: {fileID: 3554261976334479085}
24032404
m_Layer: 0
2404-
m_Name: SceneContent
2405+
m_Name: MixedRealitySceneContent
24052406
m_TagString: Untagged
24062407
m_Icon: {fileID: 0}
24072408
m_NavMeshLayer: 0
24082409
m_StaticEditorFlags: 0
24092410
m_IsActive: 1
2411+
--- !u!114 &3554261976334479085
2412+
MonoBehaviour:
2413+
m_ObjectHideFlags: 0
2414+
m_CorrespondingSourceObject: {fileID: 0}
2415+
m_PrefabInstance: {fileID: 0}
2416+
m_PrefabAsset: {fileID: 0}
2417+
m_GameObject: {fileID: 3554261976334479084}
2418+
m_Enabled: 1
2419+
m_EditorHideFlags: 0
2420+
m_Script: {fileID: 11500000, guid: c65c9dd2f312b8d41b8849d58e1053fa, type: 3}
2421+
m_Name:
2422+
m_EditorClassIdentifier:
2423+
alignmentType: 0
24102424
--- !u!1 &3554391572042510770
24112425
GameObject:
24122426
m_ObjectHideFlags: 0

‎Assets/MRTK/Examples/Demos/EyeTracking/Scenes/EyeTrackingDemo-03-Navigation.unity‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,8 +315,9 @@ GameObject:
315315
serializedVersion: 6
316316
m_Component:
317317
- component: {fileID: 9949653}
318+
- component: {fileID: 9949654}
318319
m_Layer: 0
319-
m_Name: SceneContent
320+
m_Name: MixedRealitySceneContent
320321
m_TagString: Untagged
321322
m_Icon: {fileID: 0}
322323
m_NavMeshLayer: 0
@@ -342,6 +343,19 @@ Transform:
342343
m_Father: {fileID: 0}
343344
m_RootOrder: 3
344345
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
346+
--- !u!114 &9949654
347+
MonoBehaviour:
348+
m_ObjectHideFlags: 0
349+
m_CorrespondingSourceObject: {fileID: 0}
350+
m_PrefabInstance: {fileID: 0}
351+
m_PrefabAsset: {fileID: 0}
352+
m_GameObject: {fileID: 9949652}
353+
m_Enabled: 1
354+
m_EditorHideFlags: 0
355+
m_Script: {fileID: 11500000, guid: c65c9dd2f312b8d41b8849d58e1053fa, type: 3}
356+
m_Name:
357+
m_EditorClassIdentifier:
358+
alignmentType: 0
345359
--- !u!1001 &63132508
346360
PrefabInstance:
347361
m_ObjectHideFlags: 0

‎Assets/MRTK/Examples/Demos/EyeTracking/Scenes/EyeTrackingDemo-04-TargetPositioning.unity‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,9 @@ GameObject:
122122
serializedVersion: 6
123123
m_Component:
124124
- component: {fileID: 9949653}
125+
- component: {fileID: 9949654}
125126
m_Layer: 0
126-
m_Name: SceneContent
127+
m_Name: MixedRealitySceneContent
127128
m_TagString: Untagged
128129
m_Icon: {fileID: 0}
129130
m_NavMeshLayer: 0
@@ -146,6 +147,19 @@ Transform:
146147
m_Father: {fileID: 0}
147148
m_RootOrder: 3
148149
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
150+
--- !u!114 &9949654
151+
MonoBehaviour:
152+
m_ObjectHideFlags: 0
153+
m_CorrespondingSourceObject: {fileID: 0}
154+
m_PrefabInstance: {fileID: 0}
155+
m_PrefabAsset: {fileID: 0}
156+
m_GameObject: {fileID: 9949652}
157+
m_Enabled: 1
158+
m_EditorHideFlags: 0
159+
m_Script: {fileID: 11500000, guid: c65c9dd2f312b8d41b8849d58e1053fa, type: 3}
160+
m_Name:
161+
m_EditorClassIdentifier:
162+
alignmentType: 0
149163
--- !u!1 &25280373
150164
GameObject:
151165
m_ObjectHideFlags: 0

‎Assets/MRTK/Examples/Demos/EyeTracking/Scenes/EyeTrackingDemo-05-Visualizer.unity‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,9 @@ GameObject:
122122
serializedVersion: 6
123123
m_Component:
124124
- component: {fileID: 9949653}
125+
- component: {fileID: 9949654}
125126
m_Layer: 0
126-
m_Name: SceneContent
127+
m_Name: MixedRealitySceneContent
127128
m_TagString: Untagged
128129
m_Icon: {fileID: 0}
129130
m_NavMeshLayer: 0
@@ -147,6 +148,19 @@ Transform:
147148
m_Father: {fileID: 0}
148149
m_RootOrder: 3
149150
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
151+
--- !u!114 &9949654
152+
MonoBehaviour:
153+
m_ObjectHideFlags: 0
154+
m_CorrespondingSourceObject: {fileID: 0}
155+
m_PrefabInstance: {fileID: 0}
156+
m_PrefabAsset: {fileID: 0}
157+
m_GameObject: {fileID: 9949652}
158+
m_Enabled: 1
159+
m_EditorHideFlags: 0
160+
m_Script: {fileID: 11500000, guid: c65c9dd2f312b8d41b8849d58e1053fa, type: 3}
161+
m_Name:
162+
m_EditorClassIdentifier:
163+
alignmentType: 0
150164
--- !u!1 &59515335
151165
GameObject:
152166
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)