Skip to content

Commit 45093c4

Browse files
keveleighkeveleigh
authored
Reserialize org.mixedrealitytoolkit.uxcomponents.noncanvas for Unity 6 (#1126)
* Update to remove unused prefab overrides * Button folder * ButtonGroup folder * Dialog folder * HandMenu folder * ListMenu folder * ObjectBar folder * SeeItSayItLabel folder * Slates folder * Slider folder * Toggles folder * Migrate more UXComponents * Update CHANGELOGs
1 parent 7392248 commit 45093c4

94 files changed

Lines changed: 2276 additions & 3797 deletions

File tree

Some content is hidden

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

‎org.mixedrealitytoolkit.core/CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
2525

2626
* Updated the minimum editor version to 6000.0.66f2 [PR #1112](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1112)
2727
* Updated code style in `HandsSubsystemDescriptor`, `MRTKSubsystemDescriptor`, `DictationSubsystemDescriptor`, and `XRSubsystemHelpers`. [PR #1109](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1109)
28+
* Updated `ReserializeUtility` to remove unused prefab overrides. [PR #1126](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1126)
2829

2930
### Fixed
3031

‎org.mixedrealitytoolkit.core/Editor/Utilities/ReserializeAssetsUtility.cs‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,32 @@ public static void ReserializeSelection()
4949
{
5050
Object[] selectedAssets = Selection.GetFiltered(typeof(Object), SelectionMode.DeepAssets);
5151

52-
// Transform asset object to asset paths.
52+
// Transform asset object to asset paths and GameObjects.
5353
List<string> assetsPath = new List<string>();
54+
List<GameObject> assetsGameObjects = new List<GameObject>();
5455
foreach (Object asset in selectedAssets)
5556
{
5657
assetsPath.Add(AssetDatabase.GetAssetPath(asset));
58+
if (asset is GameObject rootGo)
59+
{
60+
Transform[] children = rootGo.GetComponentsInChildren<Transform>(true);
61+
foreach (Transform child in children)
62+
{
63+
if (PrefabUtility.IsAnyPrefabInstanceRoot(child.gameObject))
64+
{
65+
assetsGameObjects.Add(child.gameObject);
66+
}
67+
}
68+
}
5769
}
5870

5971
string[] array = assetsPath.ToArray();
6072
AssetDatabase.ForceReserializeAssets(array);
61-
Debug.Log($"Reserialized {array.Length} assets.");
73+
if (assetsGameObjects.Count > 0)
74+
{
75+
PrefabUtility.RemoveUnusedOverrides(assetsGameObjects.ToArray(), InteractionMode.UserAction);
76+
}
77+
Debug.Log($"Reserialized {array.Length} assets. ({assetsGameObjects.Count} prefab instances had unused overrides removed)");
6278
}
6379

6480
private static string[] GetAssets(string filter)

‎org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/128x32/PressableButton_128x32mm_IconAndText_L.prefab‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ PrefabInstance:
55
m_ObjectHideFlags: 0
66
serializedVersion: 2
77
m_Modification:
8+
serializedVersion: 3
89
m_TransformParent: {fileID: 0}
910
m_Modifications:
1011
- target: {fileID: 1494106019810454970, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3}
@@ -43,10 +44,6 @@ PrefabInstance:
4344
propertyPath: m_IsActive
4445
value: 0
4546
objectReference: {fileID: 0}
46-
- target: {fileID: 8829903862454882072, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3}
47-
propertyPath: m_RootOrder
48-
value: 0
49-
objectReference: {fileID: 0}
5047
- target: {fileID: 8829903862454882072, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3}
5148
propertyPath: m_LocalPosition.x
5249
value: 0
@@ -103,6 +100,8 @@ PrefabInstance:
103100
propertyPath: m_AnchoredPosition.x
104101
value: 0.00954
105102
objectReference: {fileID: 0}
106-
m_RemovedComponents:
107-
- {fileID: 2981563222846597991, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3}
103+
m_RemovedComponents: []
104+
m_RemovedGameObjects: []
105+
m_AddedGameObjects: []
106+
m_AddedComponents: []
108107
m_SourcePrefab: {fileID: 100100000, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3}

‎org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/128x32/PressableButton_128x32mm_IconAndText_R.prefab‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ PrefabInstance:
55
m_ObjectHideFlags: 0
66
serializedVersion: 2
77
m_Modification:
8+
serializedVersion: 3
89
m_TransformParent: {fileID: 0}
910
m_Modifications:
1011
- target: {fileID: 1969163422732972035, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3}
@@ -31,10 +32,6 @@ PrefabInstance:
3132
propertyPath: m_IsActive
3233
value: 0
3334
objectReference: {fileID: 0}
34-
- target: {fileID: 8829903862454882072, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3}
35-
propertyPath: m_RootOrder
36-
value: 0
37-
objectReference: {fileID: 0}
3835
- target: {fileID: 8829903862454882072, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3}
3936
propertyPath: m_LocalPosition.x
4037
value: 0
@@ -92,4 +89,7 @@ PrefabInstance:
9289
value: -0.00928
9390
objectReference: {fileID: 0}
9491
m_RemovedComponents: []
92+
m_RemovedGameObjects: []
93+
m_AddedGameObjects: []
94+
m_AddedComponents: []
9595
m_SourcePrefab: {fileID: 100100000, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3}

‎org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/128x32/PressableButton_128x32mm_PersonAndText.prefab‎

Lines changed: 34 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Transform:
2323
m_PrefabInstance: {fileID: 0}
2424
m_PrefabAsset: {fileID: 0}
2525
m_GameObject: {fileID: 4912994083753280318}
26+
serializedVersion: 2
2627
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
2728
m_LocalPosition: {x: -0.048, y: 0, z: 0}
2829
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -31,7 +32,6 @@ Transform:
3132
- {fileID: 411343838116714667}
3233
- {fileID: 4907459964619627130}
3334
m_Father: {fileID: 4407735199717223959}
34-
m_RootOrder: 4
3535
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3636
--- !u!1 &5313832380967302489
3737
GameObject:
@@ -59,13 +59,13 @@ Transform:
5959
m_PrefabInstance: {fileID: 0}
6060
m_PrefabAsset: {fileID: 0}
6161
m_GameObject: {fileID: 5313832380967302489}
62+
serializedVersion: 2
6263
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
6364
m_LocalPosition: {x: 0, y: 0, z: 0}
6465
m_LocalScale: {x: 0.02, y: 0.02, z: 0.02}
6566
m_ConstrainProportionsScale: 0
6667
m_Children: []
6768
m_Father: {fileID: 1268481309119342633}
68-
m_RootOrder: 0
6969
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
7070
--- !u!33 &3084448489427758450
7171
MeshFilter:
@@ -92,6 +92,9 @@ MeshRenderer:
9292
m_ReflectionProbeUsage: 1
9393
m_RayTracingMode: 2
9494
m_RayTraceProcedural: 0
95+
m_RayTracingAccelStructBuildFlagsOverride: 0
96+
m_RayTracingAccelStructBuildFlags: 1
97+
m_SmallMeshCulling: 1
9598
m_RenderingLayerMask: 1
9699
m_RendererPriority: 0
97100
m_Materials:
@@ -125,9 +128,17 @@ MeshCollider:
125128
m_PrefabAsset: {fileID: 0}
126129
m_GameObject: {fileID: 5313832380967302489}
127130
m_Material: {fileID: 0}
131+
m_IncludeLayers:
132+
serializedVersion: 2
133+
m_Bits: 0
134+
m_ExcludeLayers:
135+
serializedVersion: 2
136+
m_Bits: 0
137+
m_LayerOverridePriority: 0
128138
m_IsTrigger: 0
139+
m_ProvidesContacts: 0
129140
m_Enabled: 0
130-
serializedVersion: 4
141+
serializedVersion: 5
131142
m_Convex: 0
132143
m_CookingOptions: 30
133144
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
@@ -157,13 +168,13 @@ Transform:
157168
m_PrefabInstance: {fileID: 0}
158169
m_PrefabAsset: {fileID: 0}
159170
m_GameObject: {fileID: 8012239837945830335}
171+
serializedVersion: 2
160172
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
161173
m_LocalPosition: {x: 0.0076, y: -0.007, z: 0}
162174
m_LocalScale: {x: 0.006177776, y: 0.006177776, z: 0.006177776}
163175
m_ConstrainProportionsScale: 0
164176
m_Children: []
165177
m_Father: {fileID: 1268481309119342633}
166-
m_RootOrder: 1
167178
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
168179
--- !u!33 &2468094668517419922
169180
MeshFilter:
@@ -190,6 +201,9 @@ MeshRenderer:
190201
m_ReflectionProbeUsage: 1
191202
m_RayTracingMode: 2
192203
m_RayTraceProcedural: 0
204+
m_RayTracingAccelStructBuildFlagsOverride: 0
205+
m_RayTracingAccelStructBuildFlags: 1
206+
m_SmallMeshCulling: 1
193207
m_RenderingLayerMask: 1
194208
m_RendererPriority: 0
195209
m_Materials:
@@ -223,9 +237,17 @@ MeshCollider:
223237
m_PrefabAsset: {fileID: 0}
224238
m_GameObject: {fileID: 8012239837945830335}
225239
m_Material: {fileID: 0}
240+
m_IncludeLayers:
241+
serializedVersion: 2
242+
m_Bits: 0
243+
m_ExcludeLayers:
244+
serializedVersion: 2
245+
m_Bits: 0
246+
m_LayerOverridePriority: 0
226247
m_IsTrigger: 0
248+
m_ProvidesContacts: 0
227249
m_Enabled: 0
228-
serializedVersion: 4
250+
serializedVersion: 5
229251
m_Convex: 0
230252
m_CookingOptions: 30
231253
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
@@ -234,6 +256,7 @@ PrefabInstance:
234256
m_ObjectHideFlags: 0
235257
serializedVersion: 2
236258
m_Modification:
259+
serializedVersion: 3
237260
m_TransformParent: {fileID: 0}
238261
m_Modifications:
239262
- target: {fileID: 564332035890725350, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3}
@@ -244,10 +267,6 @@ PrefabInstance:
244267
propertyPath: m_IsActive
245268
value: 0
246269
objectReference: {fileID: 0}
247-
- target: {fileID: 6366612888026126601, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3}
248-
propertyPath: m_RootOrder
249-
value: 0
250-
objectReference: {fileID: 0}
251270
- target: {fileID: 6366612888026126601, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3}
252271
propertyPath: m_LocalPosition.x
253272
value: 0
@@ -297,6 +316,12 @@ PrefabInstance:
297316
value: PressableButton_128x32mm_PersonAndText
298317
objectReference: {fileID: 0}
299318
m_RemovedComponents: []
319+
m_RemovedGameObjects: []
320+
m_AddedGameObjects:
321+
- targetCorrespondingSourceObject: {fileID: 9173695956475796094, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3}
322+
insertIndex: -1
323+
addedObject: {fileID: 1268481309119342633}
324+
m_AddedComponents: []
300325
m_SourcePrefab: {fileID: 100100000, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3}
301326
--- !u!4 &4407735199717223959 stripped
302327
Transform:

‎org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/128x32/PressableButton_128x32mm_SinglelineTextWithSubtitle.prefab‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ RectTransform:
3131
m_ConstrainProportionsScale: 0
3232
m_Children: []
3333
m_Father: {fileID: 6804149258562065805}
34-
m_RootOrder: 4
3534
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3635
m_AnchorMin: {x: 0.5, y: 0.5}
3736
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -55,6 +54,9 @@ MeshRenderer:
5554
m_ReflectionProbeUsage: 1
5655
m_RayTracingMode: 2
5756
m_RayTraceProcedural: 0
57+
m_RayTracingAccelStructBuildFlagsOverride: 0
58+
m_RayTracingAccelStructBuildFlags: 1
59+
m_SmallMeshCulling: 1
5860
m_RenderingLayerMask: 4294967295
5961
m_RendererPriority: 0
6062
m_Materials:
@@ -138,20 +140,23 @@ MonoBehaviour:
138140
m_VerticalAlignment: 512
139141
m_textAlignment: 65535
140142
m_characterSpacing: 0
143+
m_characterHorizontalScale: 1
141144
m_wordSpacing: 0
142145
m_lineSpacing: 0
143146
m_lineSpacingMax: 0
144147
m_paragraphSpacing: 0
145148
m_charWidthMaxAdj: 0
146-
m_enableWordWrapping: 1
149+
m_TextWrappingMode: 1
147150
m_wordWrappingRatios: 0.4
148151
m_overflowMode: 0
149152
m_linkedTextComponent: {fileID: 0}
150153
parentLinkedComponent: {fileID: 0}
151154
m_enableKerning: 1
155+
m_ActiveFontFeatures: 00000000
152156
m_enableExtraPadding: 0
153157
checkPaddingRequired: 0
154158
m_isRichText: 1
159+
m_EmojiFallbackSupport: 1
155160
m_parseCtrlCharacters: 1
156161
m_isOrthographic: 0
157162
m_isCullingEnabled: 0
@@ -177,12 +182,9 @@ PrefabInstance:
177182
m_ObjectHideFlags: 0
178183
serializedVersion: 2
179184
m_Modification:
185+
serializedVersion: 3
180186
m_TransformParent: {fileID: 0}
181187
m_Modifications:
182-
- target: {fileID: 8829903862454882072, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3}
183-
propertyPath: m_RootOrder
184-
value: 0
185-
objectReference: {fileID: 0}
186188
- target: {fileID: 8829903862454882072, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3}
187189
propertyPath: m_LocalPosition.x
188190
value: 0
@@ -232,6 +234,12 @@ PrefabInstance:
232234
value: 0.0024
233235
objectReference: {fileID: 0}
234236
m_RemovedComponents: []
237+
m_RemovedGameObjects: []
238+
m_AddedGameObjects:
239+
- targetCorrespondingSourceObject: {fileID: 6746213747597823087, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3}
240+
insertIndex: -1
241+
addedObject: {fileID: 162236023003044723}
242+
m_AddedComponents: []
235243
m_SourcePrefab: {fileID: 100100000, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3}
236244
--- !u!4 &6804149258562065805 stripped
237245
Transform:

‎org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/128x32/PressableButton_128x32mm_SubtitleWithSinglelineText.prefab‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ PrefabInstance:
55
m_ObjectHideFlags: 0
66
serializedVersion: 2
77
m_Modification:
8+
serializedVersion: 3
89
m_TransformParent: {fileID: 0}
910
m_Modifications:
1011
- target: {fileID: 162236023003044723, guid: 763be22d1f08e6741a7101dacd726814, type: 3}
@@ -27,10 +28,6 @@ PrefabInstance:
2728
propertyPath: m_Name
2829
value: PressableButton_128x32mm_SubtitleWithSinglelineText
2930
objectReference: {fileID: 0}
30-
- target: {fileID: 8752872172617307898, guid: 763be22d1f08e6741a7101dacd726814, type: 3}
31-
propertyPath: m_RootOrder
32-
value: 0
33-
objectReference: {fileID: 0}
3431
- target: {fileID: 8752872172617307898, guid: 763be22d1f08e6741a7101dacd726814, type: 3}
3532
propertyPath: m_LocalPosition.x
3633
value: 0
@@ -72,4 +69,7 @@ PrefabInstance:
7269
value: 0
7370
objectReference: {fileID: 0}
7471
m_RemovedComponents: []
72+
m_RemovedGameObjects: []
73+
m_AddedGameObjects: []
74+
m_AddedComponents: []
7575
m_SourcePrefab: {fileID: 100100000, guid: 763be22d1f08e6741a7101dacd726814, type: 3}

0 commit comments

Comments
 (0)