Skip to content

Commit 1a650ba

Browse files
keveleighZee2
andauthored
Theming! (#1119)
* Initial checkins * org.mixedrealitytoolkit.core updates * org.mixedrealitytoolkit.uxcore updates * Reserialize scenes for Unity 6 * Add org.mixedrealitytoolkit.theming * org.mixedrealitytoolkit.uxcomponents updates * Update examples * Update CHANGELOGs Update package.json * Update some icons * Move ThemeBinding into UXCore * Updates to org.mixedrealitytoolkit.theming * Updates to org.mixedrealitytoolkit.uxcore * Return ThemeDefinition to being a ScriptableObject Easier sharing of schema * Ensure invalid types are handled throughout the flow * Fixed editing multiple FontIconSets at once * Add cachedButtonOptions * All the null checks! * Invalidate failedTypes during AssemblyReloadEvents.afterAssemblyReload --------- Co-authored-by: Finn Sinclair <finnnorth@gmail.com>
1 parent db1cbd6 commit 1a650ba

135 files changed

Lines changed: 5905 additions & 808 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.

UnityProjects/MRTKDevTemplate/Assets/Prefabs/CanvasExample/TopNavigationExample.prefab

Lines changed: 45 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,7 @@ GameObject:
427427
- component: {fileID: 4095427112833100002}
428428
- component: {fileID: 4095427112833100000}
429429
- component: {fileID: 4095427112833100001}
430+
- component: {fileID: 7538724603407037766}
430431
m_Layer: 5
431432
m_Name: TopNavigationExample
432433
m_TagString: Untagged
@@ -493,6 +494,47 @@ MonoBehaviour:
493494
thickness: 2
494495
wedges: 8
495496
calculateSmoothEdges: 1
497+
--- !u!114 &7538724603407037766
498+
MonoBehaviour:
499+
m_ObjectHideFlags: 0
500+
m_CorrespondingSourceObject: {fileID: 0}
501+
m_PrefabInstance: {fileID: 0}
502+
m_PrefabAsset: {fileID: 0}
503+
m_GameObject: {fileID: 4095427112833100003}
504+
m_Enabled: 1
505+
m_EditorHideFlags: 0
506+
m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3}
507+
m_Name:
508+
m_EditorClassIdentifier:
509+
themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2}
510+
binders:
511+
- rid: 7636826640568287471
512+
- rid: 7617100123102511115
513+
- rid: 7617100121658621991
514+
- rid: 7617100121658621992
515+
references:
516+
version: 2
517+
RefIds:
518+
- rid: 7617100121658621991
519+
type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming}
520+
data:
521+
<Target>k__BackingField: {fileID: 6126417514449433620}
522+
<ThemeDefinitionItemName>k__BackingField: On Surface Color
523+
- rid: 7617100121658621992
524+
type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming}
525+
data:
526+
<Target>k__BackingField: {fileID: 6126417514449433620}
527+
<ThemeDefinitionItemName>k__BackingField: Text Font
528+
- rid: 7617100123102511115
529+
type: {class: ImageSpriteBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming}
530+
data:
531+
<Target>k__BackingField: {fileID: 7377956084833273159}
532+
<ThemeDefinitionItemName>k__BackingField: MRTK Logo
533+
- rid: 7636826640568287471
534+
type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming}
535+
data:
536+
<Target>k__BackingField: {fileID: 4095427112833100001}
537+
<ThemeDefinitionItemName>k__BackingField: Backplate Material
496538
--- !u!1 &4095427113250735759
497539
GameObject:
498540
m_ObjectHideFlags: 0
@@ -810,7 +852,7 @@ PrefabInstance:
810852
objectReference: {fileID: 0}
811853
- target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
812854
propertyPath: currentIconName
813-
value: Icon 100
855+
value: Lightbulb
814856
objectReference: {fileID: 0}
815857
- target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
816858
propertyPath: m_Name
@@ -984,7 +1026,7 @@ PrefabInstance:
9841026
objectReference: {fileID: 0}
9851027
- target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
9861028
propertyPath: currentIconName
987-
value: Icon 107
1029+
value: Movie
9881030
objectReference: {fileID: 0}
9891031
- target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
9901032
propertyPath: m_Name
@@ -1678,7 +1720,7 @@ PrefabInstance:
16781720
objectReference: {fileID: 0}
16791721
- target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
16801722
propertyPath: currentIconName
1681-
value: Icon 92
1723+
value: Heart Outline
16821724
objectReference: {fileID: 0}
16831725
- target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
16841726
propertyPath: m_Name

UnityProjects/MRTKDevTemplate/Assets/Prefabs/SampleSceneHelper/DescriptionPanel.prefab

Lines changed: 80 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -674,6 +674,7 @@ GameObject:
674674
- component: {fileID: 3220012215463627515}
675675
- component: {fileID: 8084989196684289760}
676676
- component: {fileID: 5404797170367061738}
677+
- component: {fileID: 863618738849702724}
677678
m_Layer: 5
678679
m_Name: DescriptionPanel
679680
m_TagString: Untagged
@@ -750,7 +751,84 @@ MonoBehaviour:
750751
m_FallbackScreenDPI: 96
751752
m_DefaultSpriteDPI: 96
752753
m_DynamicPixelsPerUnit: 1
753-
m_PresetInfoIsWorld: 0
754+
m_PresetInfoIsWorld: 1
755+
--- !u!114 &863618738849702724
756+
MonoBehaviour:
757+
m_ObjectHideFlags: 0
758+
m_CorrespondingSourceObject: {fileID: 0}
759+
m_PrefabInstance: {fileID: 0}
760+
m_PrefabAsset: {fileID: 0}
761+
m_GameObject: {fileID: 6540126486176102408}
762+
m_Enabled: 1
763+
m_EditorHideFlags: 0
764+
m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3}
765+
m_Name:
766+
m_EditorClassIdentifier:
767+
themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2}
768+
binders:
769+
- rid: 7617100123102511104
770+
- rid: 7617100123102511105
771+
- rid: 7617100123102511106
772+
- rid: 7617100123102511107
773+
- rid: 7617100123102511108
774+
- rid: 7617100123102511109
775+
- rid: 7617100123102511110
776+
- rid: 7617100123102511111
777+
- rid: 7617100123102511113
778+
- rid: 7617100459693309976
779+
references:
780+
version: 2
781+
RefIds:
782+
- rid: 7617100123102511104
783+
type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming}
784+
data:
785+
<Target>k__BackingField: {fileID: 6809291684801504143}
786+
<ThemeDefinitionItemName>k__BackingField: On Surface Color
787+
- rid: 7617100123102511105
788+
type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming}
789+
data:
790+
<Target>k__BackingField: {fileID: 6809291684801504143}
791+
<ThemeDefinitionItemName>k__BackingField: Text Font
792+
- rid: 7617100123102511106
793+
type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming}
794+
data:
795+
<Target>k__BackingField: {fileID: 4568172237328552037}
796+
<ThemeDefinitionItemName>k__BackingField: On Surface Color
797+
- rid: 7617100123102511107
798+
type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming}
799+
data:
800+
<Target>k__BackingField: {fileID: 4568172237328552037}
801+
<ThemeDefinitionItemName>k__BackingField: Text Font
802+
- rid: 7617100123102511108
803+
type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming}
804+
data:
805+
<Target>k__BackingField: {fileID: 2446705927233332293}
806+
<ThemeDefinitionItemName>k__BackingField: On Surface Color
807+
- rid: 7617100123102511109
808+
type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming}
809+
data:
810+
<Target>k__BackingField: {fileID: 2446705927233332293}
811+
<ThemeDefinitionItemName>k__BackingField: Text Font
812+
- rid: 7617100123102511110
813+
type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming}
814+
data:
815+
<Target>k__BackingField: {fileID: 4376175471552893095}
816+
<ThemeDefinitionItemName>k__BackingField: On Surface Color
817+
- rid: 7617100123102511111
818+
type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming}
819+
data:
820+
<Target>k__BackingField: {fileID: 5822078602719066722}
821+
<ThemeDefinitionItemName>k__BackingField: On Surface Color
822+
- rid: 7617100123102511113
823+
type: {class: SpriteRendererSpriteBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming}
824+
data:
825+
<Target>k__BackingField: {fileID: 1051251617942771901}
826+
<ThemeDefinitionItemName>k__BackingField: MRTK Logo
827+
- rid: 7617100459693309976
828+
type: {class: RendererMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming}
829+
data:
830+
<Target>k__BackingField: {fileID: 6676203961570324161}
831+
<ThemeDefinitionItemName>k__BackingField: Non-Canvas Backplate (8mm) Material
754832
--- !u!1 &7368034384095272423
755833
GameObject:
756834
m_ObjectHideFlags: 0
@@ -795,7 +873,7 @@ GameObject:
795873
- component: {fileID: 3732017194820540582}
796874
- component: {fileID: 1051251617942771901}
797875
m_Layer: 0
798-
m_Name: MRTK_Logo_White
876+
m_Name: MRTK_Logo
799877
m_TagString: Untagged
800878
m_Icon: {fileID: 0}
801879
m_NavMeshLayer: 0

0 commit comments

Comments
 (0)