Skip to content

Commit f279218

Browse files
authored
Fixing shaders of a couple of TMPro fonts (#696)
* Updating MRTK_FluentIconSet SDF's shader to a Graphic Tools TMPro shader, so the font works in UPM projects. Also, setting the Data packages's CooperHewitt-BoldItalic SDK shader to the Graphic Tools TMPro shader, is its original shader is missing. * Updating "preview" tag, since a preview package was updated
1 parent 6d92665 commit f279218

3 files changed

Lines changed: 19 additions & 5 deletions

File tree

Pipelines/Config/settings.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ variables:
55
# ProjectSettings/ProjectSettings.asset: bundleVersion: x.x.x
66
# ProjectSettings/ProjectSettings.asset: metroPackageVersion: x.x.x.0
77
MRTKVersion: 3.0.0 # used for overall build number, but each package version is read from the package.json file in each package directory.
8-
MRTKReleaseTag: 'pre.19' # final version component, e.g. 'RC2.1' or empty string.
8+
MRTKReleaseTag: 'pre.20' # final version component, e.g. 'RC2.1' or empty string.
99
ReleasePackages: '"org.mixedrealitytoolkit.audio,org.mixedrealitytoolkit.core,org.mixedrealitytoolkit.diagnostics,org.mixedrealitytoolkit.extendedassets,org.mixedrealitytoolkit.input,org.mixedrealitytoolkit.spatialmanipulation,org.mixedrealitytoolkit.standardassets,org.mixedrealitytoolkit.tools,org.mixedrealitytoolkit.uxcomponents,org.mixedrealitytoolkit.uxcomponents.noncanvas,org.mixedrealitytoolkit.uxcore,org.mixedrealitytoolkit.windowsspeech"' # array of packages that shouldn't get the prerelease tag e.g. '"org.mixedrealitytoolkit.core,org.mixedrealitytoolkit.tools"'

UnityProjects/MRTKDevTemplate/Assets/Data Binding Example/Resources/Fonts & Materials/CooperHewitt-BoldItalic SDF.asset

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ Material:
5555
m_PrefabInstance: {fileID: 0}
5656
m_PrefabAsset: {fileID: 0}
5757
m_Name: CooperHewitt-BoldItalic SDF Material
58-
m_Shader: {fileID: 4800000, guid: 1c504b73bf66872479cd1215fb5ce0fe, type: 3}
59-
m_ValidKeywords: []
60-
m_InvalidKeywords:
58+
m_Shader: {fileID: 4800000, guid: c5f3f59b19556b3479f929a84f25f776, type: 3}
59+
m_ValidKeywords:
6160
- OUTLINE_ON
61+
m_InvalidKeywords: []
6262
m_LightmapFlags: 4
6363
m_EnableInstancingVariants: 0
6464
m_DoubleSidedGI: 0
@@ -99,7 +99,10 @@ Material:
9999
- _BumpFace: 0
100100
- _BumpOutline: 0
101101
- _ColorMask: 15
102+
- _CullMode: 0
102103
- _Diffuse: 0.5
104+
- _DstBlend: 10
105+
- _DstBlendAlpha: 1
103106
- _FaceDilate: 0
104107
- _FaceUVSpeedX: 0
105108
- _FaceUVSpeedY: 0
@@ -125,6 +128,8 @@ Material:
125128
- _ShaderFlags: 0
126129
- _Sharpness: 0
127130
- _SpecularPower: 2
131+
- _SrcBlend: 1
132+
- _SrcBlendAlpha: 1
128133
- _Stencil: 0
129134
- _StencilComp: 8
130135
- _StencilOp: 0
@@ -140,9 +145,11 @@ Material:
140145
- _VertexOffsetY: 0
141146
- _WeightBold: 0.75
142147
- _WeightNormal: 0
148+
- _ZTest: 4
143149
- _ZWrite: 0
144150
m_Colors:
145151
- _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
152+
- _ClipRectRadii: {r: 10, g: 10, b: 10, a: 10}
146153
- _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0}
147154
- _FaceColor: {r: 1, g: 1, b: 1, a: 1}
148155
- _GlowColor: {r: 0, g: 1, b: 0, a: 0.5}

org.mixedrealitytoolkit.standardassets/Icons/MRTK_FluentIconSet SDF.asset

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3794,7 +3794,7 @@ Material:
37943794
m_PrefabInstance: {fileID: 0}
37953795
m_PrefabAsset: {fileID: 0}
37963796
m_Name: MRTK_FluentIconSet SDF Material
3797-
m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3}
3797+
m_Shader: {fileID: 4800000, guid: c5f3f59b19556b3479f929a84f25f776, type: 3}
37983798
m_ValidKeywords: []
37993799
m_InvalidKeywords: []
38003800
m_LightmapFlags: 4
@@ -3839,6 +3839,8 @@ Material:
38393839
- _ColorMask: 15
38403840
- _CullMode: 0
38413841
- _Diffuse: 0.5
3842+
- _DstBlend: 10
3843+
- _DstBlendAlpha: 1
38423844
- _FaceDilate: 0
38433845
- _FaceUVSpeedX: 0
38443846
- _FaceUVSpeedY: 0
@@ -3864,6 +3866,8 @@ Material:
38643866
- _ShaderFlags: 0
38653867
- _Sharpness: 0
38663868
- _SpecularPower: 2
3869+
- _SrcBlend: 1
3870+
- _SrcBlendAlpha: 1
38673871
- _Stencil: 0
38683872
- _StencilComp: 8
38693873
- _StencilOp: 0
@@ -3879,8 +3883,11 @@ Material:
38793883
- _VertexOffsetY: 0
38803884
- _WeightBold: 0.75
38813885
- _WeightNormal: 0
3886+
- _ZTest: 4
3887+
- _ZWrite: 0
38823888
m_Colors:
38833889
- _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
3890+
- _ClipRectRadii: {r: 10, g: 10, b: 10, a: 10}
38843891
- _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0}
38853892
- _FaceColor: {r: 1, g: 1, b: 1, a: 1}
38863893
- _GlowColor: {r: 0, g: 1, b: 0, a: 0.5}

0 commit comments

Comments
 (0)