Skip to content

Commit a71604c

Browse files
StephenHodgsonStephenHodgson
authored
Merge pull request #2502 from Cameron-Micka/stdShaderChannelMaps
Mixed Reality Toolkit Standard Shader New Features
2 parents 1b9a6c9 + 1524324 commit a71604c

File tree

78 files changed

+23878
-426
lines changed

Some content is hidden

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

78 files changed

+23878
-426
lines changed

‎Assets/MixedRealityToolkit-Examples/Demos/StandardShader/Materials/CubeBorder.mat‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
7-
m_PrefabParentObject: {fileID: 0}
7+
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInternal: {fileID: 0}
99
m_Name: CubeBorder
1010
m_Shader: {fileID: 4800000, guid: d45c0efca53019e43891b0f610f8146e, type: 3}
@@ -24,6 +24,10 @@ Material:
2424
m_Texture: {fileID: 0}
2525
m_Scale: {x: 1, y: 1}
2626
m_Offset: {x: 0, y: 0}
27+
- _ChannelMap:
28+
m_Texture: {fileID: 0}
29+
m_Scale: {x: 1, y: 1}
30+
m_Offset: {x: 0, y: 0}
2731
- _DetailAlbedoMap:
2832
m_Texture: {fileID: 0}
2933
m_Scale: {x: 1, y: 1}
@@ -87,7 +91,9 @@ Material:
8791
- _DirectionalLight: 0
8892
- _DstBlend: 10
8993
- _EdgeSmoothingValue: 0.002
94+
- _EnableChannelMap: 0
9095
- _EnableEmission: 0
96+
- _EnableHoverColorOpaqueOverride: 0
9197
- _EnableHoverColorOverride: 1
9298
- _EnableLightMap: 0
9399
- _EnableNormalMap: 0
@@ -100,7 +106,9 @@ Material:
100106
- _Glossiness: 0.5
101107
- _GlossyReflections: 1
102108
- _HoverLight: 1
109+
- _HoverLightOpaque: 0
103110
- _InnerGlow: 0
111+
- _InstancedColor: 0
104112
- _Metallic: 0
105113
- _Mode: 2
106114
- _NearPlaneFade: 0
@@ -119,6 +127,10 @@ Material:
119127
- _SmoothnessTextureChannel: 0
120128
- _SpecularHighlights: 1
121129
- _SrcBlend: 5
130+
- _Stencil: 0
131+
- _StencilComparison: 0
132+
- _StencilOperation: 0
133+
- _StencilReference: 0
122134
- _UVSec: 0
123135
- _ZTest: 4
124136
- _ZWrite: 0
@@ -132,6 +144,7 @@ Material:
132144
- _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
133145
- _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
134146
- _HoverColor: {r: 1, g: 0, b: 0, a: 1}
147+
- _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1}
135148
- _HoverColorOverride: {r: 0.24137926, g: 0, b: 1, a: 1}
136149
- _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
137150
- _RimColor: {r: 1, g: 1, b: 1, a: 1}

‎Assets/MixedRealityToolkit-Examples/Demos/StandardShader/Materials/CubeBorderRoundedOpaque.mat‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
7-
m_PrefabParentObject: {fileID: 0}
7+
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInternal: {fileID: 0}
99
m_Name: CubeBorderRoundedOpaque
1010
m_Shader: {fileID: 4800000, guid: d45c0efca53019e43891b0f610f8146e, type: 3}
1111
m_ShaderKeywords: _ALPHATEST_ON _BORDER_LIGHT _BORDER_LIGHT_OPAQUE _BORDER_LIGHT_USES_HOVER_COLOR
12-
_DIRECTIONAL_LIGHT _HOVER_COLOR_OVERRIDE _HOVER_LIGHT _REFLECTIONS _ROUND_CORNERS
12+
_DIRECTIONAL_LIGHT _DISABLE_ALBEDO_MAP _HOVER_COLOR_OVERRIDE _HOVER_LIGHT _ROUND_CORNERS
1313
_SPECULAR_HIGHLIGHTS
1414
m_LightmapFlags: 4
1515
m_EnableInstancingVariants: 1
@@ -25,6 +25,10 @@ Material:
2525
m_Texture: {fileID: 0}
2626
m_Scale: {x: 1, y: 1}
2727
m_Offset: {x: 0, y: 0}
28+
- _ChannelMap:
29+
m_Texture: {fileID: 0}
30+
m_Scale: {x: 1, y: 1}
31+
m_Offset: {x: 0, y: 0}
2832
- _DetailAlbedoMap:
2933
m_Texture: {fileID: 0}
3034
m_Scale: {x: 1, y: 1}
@@ -46,7 +50,7 @@ Material:
4650
m_Scale: {x: 1, y: 1}
4751
m_Offset: {x: 0, y: 0}
4852
- _MainTex:
49-
m_Texture: {fileID: 2800000, guid: 1443b22b919aede4ca14ca5e3bf81096, type: 3}
53+
m_Texture: {fileID: 0}
5054
m_Scale: {x: 1, y: 1}
5155
m_Offset: {x: 0, y: 0}
5256
- _MetallicGlossMap:
@@ -83,11 +87,12 @@ Material:
8387
- _ColorWriteMask: 15
8488
- _CullMode: 0
8589
- _CustomMode: 1
86-
- _Cutoff: 1
90+
- _Cutoff: 0.5
8791
- _DetailNormalMapScale: 1
8892
- _DirectionalLight: 1
8993
- _DstBlend: 0
9094
- _EdgeSmoothingValue: 0.002
95+
- _EnableChannelMap: 0
9196
- _EnableEmission: 0
9297
- _EnableHoverColorOpaqueOverride: 0
9398
- _EnableHoverColorOverride: 1
@@ -104,39 +109,44 @@ Material:
104109
- _HoverLight: 1
105110
- _HoverLightOpaque: 0
106111
- _InnerGlow: 0
107-
- _Metallic: 0.5
112+
- _InstancedColor: 0
113+
- _Metallic: 1
108114
- _Mode: 1
109115
- _NearPlaneFade: 0
110116
- _OcclusionStrength: 1
111117
- _Parallax: 0.02
112-
- _Reflections: 1
118+
- _Reflections: 0
113119
- _Refraction: 0
114120
- _RefractiveIndex: 1.1
115121
- _RenderQueueOverride: -1
116122
- _RimLight: 0
117123
- _RimPower: 3
118-
- _RoundCornerMargin: 0.1
124+
- _RoundCornerMargin: 0.02
119125
- _RoundCornerPower: 0.4
120-
- _RoundCornerRadius: 0.16
126+
- _RoundCornerRadius: 0.25
121127
- _RoundCorners: 1
122-
- _Smoothness: 0.5
128+
- _Smoothness: 0
123129
- _SmoothnessTextureChannel: 0
124130
- _SpecularHighlights: 1
125131
- _SrcBlend: 1
132+
- _Stencil: 0
133+
- _StencilComparison: 0
134+
- _StencilOperation: 0
135+
- _StencilReference: 0
126136
- _UVSec: 0
127137
- _ZTest: 4
128138
- _ZWrite: 1
129139
m_Colors:
130140
- _ClipPlane: {r: 0, g: 1, b: 0, a: 0}
131141
- _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
132-
- _Color: {r: 1, g: 1, b: 1, a: 0}
142+
- _Color: {r: 0.3019608, g: 0.5372549, b: 1, a: 0}
133143
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
134144
- _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
135145
- _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
136146
- _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
137147
- _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
138148
- _HoverColor: {r: 1, g: 0, b: 0, a: 1}
139149
- _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1}
140-
- _HoverColorOverride: {r: 0.1397059, g: 0.14563891, b: 1, a: 1}
150+
- _HoverColorOverride: {r: 0.8206897, g: 0, b: 1, a: 1}
141151
- _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
142152
- _RimColor: {r: 1, g: 1, b: 1, a: 1}

‎Assets/MixedRealityToolkit-Examples/Demos/StandardShader/Materials/CubeEnvironmentColor.mat‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
7-
m_PrefabParentObject: {fileID: 0}
7+
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInternal: {fileID: 0}
99
m_Name: CubeEnvironmentColor
1010
m_Shader: {fileID: 4800000, guid: d45c0efca53019e43891b0f610f8146e, type: 3}
11-
m_ShaderKeywords: _BORDER_LIGHT_USES_HOVER_COLOR _DISABLE_ALBEDO_MAP _ENVIRONMENT_COLORING
12-
_HOVER_LIGHT _INNER_GLOW
11+
m_ShaderKeywords: _BORDER_LIGHT_USES_HOVER_COLOR _DIRECTIONAL_LIGHT _DISABLE_ALBEDO_MAP
12+
_ENVIRONMENT_COLORING _HOVER_LIGHT _INNER_GLOW _SPECULAR_HIGHLIGHTS
1313
m_LightmapFlags: 4
1414
m_EnableInstancingVariants: 0
1515
m_DoubleSidedGI: 0
@@ -24,6 +24,10 @@ Material:
2424
m_Texture: {fileID: 0}
2525
m_Scale: {x: 1, y: 1}
2626
m_Offset: {x: 0, y: 0}
27+
- _ChannelMap:
28+
m_Texture: {fileID: 0}
29+
m_Scale: {x: 1, y: 1}
30+
m_Offset: {x: 0, y: 0}
2731
- _DetailAlbedoMap:
2832
m_Texture: {fileID: 0}
2933
m_Scale: {x: 1, y: 1}
@@ -72,6 +76,7 @@ Material:
7276
- _BorderLightOpaque: 0
7377
- _BorderLightUsesHoverColor: 1
7478
- _BorderMinValue: 0.1
79+
- _BorderPower: 10
7580
- _BorderWidth: 0.1
7681
- _BumpScale: 1
7782
- _ClippingPlane: 0
@@ -82,15 +87,16 @@ Material:
8287
- _CustomMode: 0
8388
- _Cutoff: 0.5
8489
- _DetailNormalMapScale: 1
85-
- _DirectionalLight: 0
90+
- _DirectionalLight: 1
8691
- _DstBlend: 0
8792
- _EdgeSmoothingValue: 0.002
93+
- _EnableChannelMap: 0
8894
- _EnableEmission: 0
8995
- _EnableHoverColorOpaqueOverride: 0
9096
- _EnableHoverColorOverride: 0
9197
- _EnableLightMap: 0
9298
- _EnableNormalMap: 0
93-
- _EnvironmentColorIntensity: 0.5
99+
- _EnvironmentColorIntensity: 1
94100
- _EnvironmentColorThreshold: 3
95101
- _EnvironmentColoring: 1
96102
- _FadeBeginDistance: 0.85
@@ -101,6 +107,7 @@ Material:
101107
- _HoverLight: 1
102108
- _HoverLightOpaque: 0
103109
- _InnerGlow: 1
110+
- _InstancedColor: 0
104111
- _Metallic: 0
105112
- _Mode: 0
106113
- _NearPlaneFade: 0
@@ -117,15 +124,19 @@ Material:
117124
- _RoundCorners: 0
118125
- _Smoothness: 0.5
119126
- _SmoothnessTextureChannel: 0
120-
- _SpecularHighlights: 0
127+
- _SpecularHighlights: 1
121128
- _SrcBlend: 1
129+
- _Stencil: 0
130+
- _StencilComparison: 0
131+
- _StencilOperation: 0
132+
- _StencilReference: 0
122133
- _UVSec: 0
123134
- _ZTest: 4
124135
- _ZWrite: 1
125136
m_Colors:
126137
- _ClipPlane: {r: 0, g: 1, b: 0, a: 0}
127138
- _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
128-
- _Color: {r: 0.41176468, g: 0.41176468, b: 0.41176468, a: 1}
139+
- _Color: {r: 0.16911763, g: 0.16911763, b: 0.16911763, a: 1}
129140
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
130141
- _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
131142
- _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}

‎Assets/MixedRealityToolkit-Examples/Demos/StandardShader/Materials/CubeInnerGlow.mat‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
7-
m_PrefabParentObject: {fileID: 0}
7+
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInternal: {fileID: 0}
99
m_Name: CubeInnerGlow
1010
m_Shader: {fileID: 4800000, guid: d45c0efca53019e43891b0f610f8146e, type: 3}
@@ -24,6 +24,10 @@ Material:
2424
m_Texture: {fileID: 0}
2525
m_Scale: {x: 1, y: 1}
2626
m_Offset: {x: 0, y: 0}
27+
- _ChannelMap:
28+
m_Texture: {fileID: 0}
29+
m_Scale: {x: 1, y: 1}
30+
m_Offset: {x: 0, y: 0}
2731
- _DetailAlbedoMap:
2832
m_Texture: {fileID: 0}
2933
m_Scale: {x: 1, y: 1}
@@ -87,7 +91,9 @@ Material:
8791
- _DirectionalLight: 0
8892
- _DstBlend: 0
8993
- _EdgeSmoothingValue: 0.002
94+
- _EnableChannelMap: 0
9095
- _EnableEmission: 0
96+
- _EnableHoverColorOpaqueOverride: 0
9197
- _EnableHoverColorOverride: 1
9298
- _EnableLightMap: 0
9399
- _EnableNormalMap: 0
@@ -100,7 +106,9 @@ Material:
100106
- _Glossiness: 0.5
101107
- _GlossyReflections: 1
102108
- _HoverLight: 1
109+
- _HoverLightOpaque: 0
103110
- _InnerGlow: 1
111+
- _InstancedColor: 0
104112
- _Metallic: 0
105113
- _Mode: 0
106114
- _NearPlaneFade: 0
@@ -119,6 +127,10 @@ Material:
119127
- _SmoothnessTextureChannel: 0
120128
- _SpecularHighlights: 1
121129
- _SrcBlend: 1
130+
- _Stencil: 0
131+
- _StencilComparison: 0
132+
- _StencilOperation: 0
133+
- _StencilReference: 0
122134
- _UVSec: 0
123135
- _ZTest: 4
124136
- _ZWrite: 1
@@ -132,6 +144,7 @@ Material:
132144
- _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
133145
- _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
134146
- _HoverColor: {r: 1, g: 0, b: 0, a: 1}
147+
- _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1}
135148
- _HoverColorOverride: {r: 0.24137926, g: 0, b: 1, a: 1}
136149
- _InnerGlowColor: {r: 0, g: 0.29655218, b: 1, a: 0.875}
137150
- _RimColor: {r: 0, g: 0.29803923, b: 1, a: 0.8745098}

‎Assets/MixedRealityToolkit-Examples/Demos/StandardShader/Materials/CubeOpaqueBorder.mat‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
7-
m_PrefabParentObject: {fileID: 0}
7+
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInternal: {fileID: 0}
99
m_Name: CubeOpaqueBorder
1010
m_Shader: {fileID: 4800000, guid: d45c0efca53019e43891b0f610f8146e, type: 3}
1111
m_ShaderKeywords: _ALPHATEST_ON _BORDER_LIGHT _BORDER_LIGHT_OPAQUE _BORDER_LIGHT_USES_HOVER_COLOR
12-
_DIRECTIONAL_LIGHT _DISABLE_ALBEDO_MAP _HOVER_COLOR_OVERRIDE _HOVER_LIGHT _SPECULAR_HIGHLIGHTS
12+
_DIRECTIONAL_LIGHT _HOVER_COLOR_OVERRIDE _HOVER_LIGHT _SPECULAR_HIGHLIGHTS
1313
m_LightmapFlags: 4
1414
m_EnableInstancingVariants: 1
1515
m_DoubleSidedGI: 0
@@ -24,6 +24,10 @@ Material:
2424
m_Texture: {fileID: 0}
2525
m_Scale: {x: 1, y: 1}
2626
m_Offset: {x: 0, y: 0}
27+
- _ChannelMap:
28+
m_Texture: {fileID: 0}
29+
m_Scale: {x: 1, y: 1}
30+
m_Offset: {x: 0, y: 0}
2731
- _DetailAlbedoMap:
2832
m_Texture: {fileID: 0}
2933
m_Scale: {x: 1, y: 1}
@@ -45,7 +49,7 @@ Material:
4549
m_Scale: {x: 1, y: 1}
4650
m_Offset: {x: 0, y: 0}
4751
- _MainTex:
48-
m_Texture: {fileID: 0}
52+
m_Texture: {fileID: 2800000, guid: 1443b22b919aede4ca14ca5e3bf81096, type: 3}
4953
m_Scale: {x: 1, y: 1}
5054
m_Offset: {x: 0, y: 0}
5155
- _MetallicGlossMap:
@@ -87,6 +91,7 @@ Material:
8791
- _DirectionalLight: 1
8892
- _DstBlend: 0
8993
- _EdgeSmoothingValue: 0.002
94+
- _EnableChannelMap: 0
9095
- _EnableEmission: 0
9196
- _EnableHoverColorOpaqueOverride: 0
9297
- _EnableHoverColorOverride: 1
@@ -103,6 +108,7 @@ Material:
103108
- _HoverLight: 1
104109
- _HoverLightOpaque: 0
105110
- _InnerGlow: 0
111+
- _InstancedColor: 0
106112
- _Metallic: 0
107113
- _Mode: 1
108114
- _NearPlaneFade: 0
@@ -121,20 +127,24 @@ Material:
121127
- _SmoothnessTextureChannel: 0
122128
- _SpecularHighlights: 1
123129
- _SrcBlend: 1
130+
- _Stencil: 0
131+
- _StencilComparison: 0
132+
- _StencilOperation: 0
133+
- _StencilReference: 0
124134
- _UVSec: 0
125135
- _ZTest: 4
126136
- _ZWrite: 1
127137
m_Colors:
128138
- _ClipPlane: {r: 0, g: 1, b: 0, a: 0}
129139
- _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
130-
- _Color: {r: 0.30147058, g: 0.5375254, b: 1, a: 0}
140+
- _Color: {r: 0.50735295, g: 0.6738337, b: 1, a: 0}
131141
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
132142
- _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
133143
- _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
134144
- _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
135145
- _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
136146
- _HoverColor: {r: 1, g: 0, b: 0, a: 1}
137147
- _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1}
138-
- _HoverColorOverride: {r: 0.20069203, g: 0.3941173, b: 0.85294116, a: 1}
148+
- _HoverColorOverride: {r: 0.16506273, g: 0.27093035, b: 0.52205884, a: 1}
139149
- _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
140150
- _RimColor: {r: 1, g: 1, b: 1, a: 1}

0 commit comments

Comments
 (0)