Skip to content

Commit b5c5b62

Browse files
killerantzkillerantz
committed
Updated the materials to use the Fast Configurable Shader
1 parent 8f45772 commit b5c5b62

27 files changed

+1188
-81
lines changed

‎Assets/HoloToolkit-Examples/Prototyping/Primitives/Materials/angleThickMaterial.mat‎

Lines changed: 44 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ Material:
77
m_PrefabParentObject: {fileID: 0}
88
m_PrefabInternal: {fileID: 0}
99
m_Name: angleThickMaterial
10-
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
11-
m_ShaderKeywords: _EMISSION
10+
m_Shader: {fileID: 4800000, guid: f1f3948b20c230044bda31b620ddd37f, type: 3}
11+
m_ShaderKeywords: _EMISSION _FORCEPERPIXEL_ON _SHADE4_ON _SPECULARHIGHLIGHTS_ON
12+
_USEAMBIENT_ON _USEDIFFUSE_ON _USEMAINCOLOR_ON _USEVERTEXCOLOR_ON
1213
m_LightmapFlags: 1
1314
m_EnableInstancingVariants: 0
1415
m_DoubleSidedGI: 0
@@ -22,6 +23,10 @@ Material:
2223
m_Texture: {fileID: 0}
2324
m_Scale: {x: 1, y: 1}
2425
m_Offset: {x: 0, y: 0}
26+
- _CubeMap:
27+
m_Texture: {fileID: 0}
28+
m_Scale: {x: 1, y: 1}
29+
m_Offset: {x: 0, y: 0}
2530
- _DetailAlbedoMap:
2631
m_Texture: {fileID: 0}
2732
m_Scale: {x: 1, y: 1}
@@ -38,6 +43,10 @@ Material:
3843
m_Texture: {fileID: 0}
3944
m_Scale: {x: 1, y: 1}
4045
m_Offset: {x: 0, y: 0}
46+
- _GlossMap:
47+
m_Texture: {fileID: 0}
48+
m_Scale: {x: 1, y: 1}
49+
m_Offset: {x: 0, y: 0}
4150
- _MainTex:
4251
m_Texture: {fileID: 0}
4352
m_Scale: {x: 1, y: 1}
@@ -54,23 +63,55 @@ Material:
5463
m_Texture: {fileID: 0}
5564
m_Scale: {x: 1, y: 1}
5665
m_Offset: {x: 0, y: 0}
66+
- _SpecularMap:
67+
m_Texture: {fileID: 0}
68+
m_Scale: {x: 1, y: 1}
69+
m_Offset: {x: 0, y: 0}
5770
m_Floats:
71+
- _AlphaTest: 0
72+
- _BlendOp: 0
5873
- _BumpScale: 1
74+
- _CalibrationSpaceReflections: 0
75+
- _ColorWriteMask: 15
76+
- _Cull: 2
5977
- _Cutoff: 0.5
6078
- _DetailNormalMapScale: 1
6179
- _DstBlend: 0
80+
- _ForcePerPixel: 1
81+
- _Gloss: 0.5
6282
- _GlossMapScale: 1
6383
- _Glossiness: 0
6484
- _GlossyReflections: 1
6585
- _Metallic: 0
6686
- _Mode: 0
6787
- _OcclusionStrength: 1
6888
- _Parallax: 0.02
89+
- _ReflectionScale: 2
90+
- _RimPower: 0.7
91+
- _Shade4: 1
6992
- _SmoothnessTextureChannel: 0
93+
- _Specular: 12
7094
- _SpecularHighlights: 1
7195
- _SrcBlend: 1
7296
- _UVSec: 0
97+
- _UseAmbient: 1
98+
- _UseBumpMap: 0
99+
- _UseDiffuse: 1
100+
- _UseEmissionColor: 0
101+
- _UseEmissionMap: 0
102+
- _UseGlossMap: 0
103+
- _UseMainColor: 1
104+
- _UseMainTex: 0
105+
- _UseOcclusionMap: 0
106+
- _UseReflections: 0
107+
- _UseRimLighting: 0
108+
- _UseSpecularMap: 0
109+
- _UseVertexColor: 1
110+
- _ZTest: 4
73111
- _ZWrite: 1
74112
m_Colors:
75-
- _Color: {r: 0.75735295, g: 0.9799189, b: 1, a: 1}
113+
- _Color: {r: 0.21176471, g: 0.77254903, b: 0.8235294, a: 1}
76114
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
115+
- _RimColor: {r: 1, g: 1, b: 1, a: 1}
116+
- _SpecColor: {r: 0.83137256, g: 0.9254902, b: 0.92156863, a: 1}
117+
- _TextureScaleOffset: {r: 1, g: 1, b: 0, a: 0}

‎Assets/HoloToolkit-Examples/Prototyping/Primitives/Materials/angleThickThinMaterial.mat‎

Lines changed: 44 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ Material:
77
m_PrefabParentObject: {fileID: 0}
88
m_PrefabInternal: {fileID: 0}
99
m_Name: angleThickThinMaterial
10-
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
11-
m_ShaderKeywords: _EMISSION
10+
m_Shader: {fileID: 4800000, guid: f1f3948b20c230044bda31b620ddd37f, type: 3}
11+
m_ShaderKeywords: _EMISSION _FORCEPERPIXEL_ON _SHADE4_ON _SPECULARHIGHLIGHTS_ON
12+
_USEAMBIENT_ON _USEDIFFUSE_ON _USEMAINCOLOR_ON _USEVERTEXCOLOR_ON
1213
m_LightmapFlags: 1
1314
m_EnableInstancingVariants: 0
1415
m_DoubleSidedGI: 0
@@ -22,6 +23,10 @@ Material:
2223
m_Texture: {fileID: 0}
2324
m_Scale: {x: 1, y: 1}
2425
m_Offset: {x: 0, y: 0}
26+
- _CubeMap:
27+
m_Texture: {fileID: 0}
28+
m_Scale: {x: 1, y: 1}
29+
m_Offset: {x: 0, y: 0}
2530
- _DetailAlbedoMap:
2631
m_Texture: {fileID: 0}
2732
m_Scale: {x: 1, y: 1}
@@ -38,6 +43,10 @@ Material:
3843
m_Texture: {fileID: 0}
3944
m_Scale: {x: 1, y: 1}
4045
m_Offset: {x: 0, y: 0}
46+
- _GlossMap:
47+
m_Texture: {fileID: 0}
48+
m_Scale: {x: 1, y: 1}
49+
m_Offset: {x: 0, y: 0}
4150
- _MainTex:
4251
m_Texture: {fileID: 0}
4352
m_Scale: {x: 1, y: 1}
@@ -54,23 +63,55 @@ Material:
5463
m_Texture: {fileID: 0}
5564
m_Scale: {x: 1, y: 1}
5665
m_Offset: {x: 0, y: 0}
66+
- _SpecularMap:
67+
m_Texture: {fileID: 0}
68+
m_Scale: {x: 1, y: 1}
69+
m_Offset: {x: 0, y: 0}
5770
m_Floats:
71+
- _AlphaTest: 0
72+
- _BlendOp: 0
5873
- _BumpScale: 1
74+
- _CalibrationSpaceReflections: 0
75+
- _ColorWriteMask: 15
76+
- _Cull: 2
5977
- _Cutoff: 0.5
6078
- _DetailNormalMapScale: 1
6179
- _DstBlend: 0
80+
- _ForcePerPixel: 1
81+
- _Gloss: 0.5
6282
- _GlossMapScale: 1
6383
- _Glossiness: 0
6484
- _GlossyReflections: 1
6585
- _Metallic: 0
6686
- _Mode: 0
6787
- _OcclusionStrength: 1
6888
- _Parallax: 0.02
89+
- _ReflectionScale: 2
90+
- _RimPower: 0.7
91+
- _Shade4: 1
6992
- _SmoothnessTextureChannel: 0
93+
- _Specular: 12
7094
- _SpecularHighlights: 1
7195
- _SrcBlend: 1
7296
- _UVSec: 0
97+
- _UseAmbient: 1
98+
- _UseBumpMap: 0
99+
- _UseDiffuse: 1
100+
- _UseEmissionColor: 0
101+
- _UseEmissionMap: 0
102+
- _UseGlossMap: 0
103+
- _UseMainColor: 1
104+
- _UseMainTex: 0
105+
- _UseOcclusionMap: 0
106+
- _UseReflections: 0
107+
- _UseRimLighting: 0
108+
- _UseSpecularMap: 0
109+
- _UseVertexColor: 1
110+
- _ZTest: 4
73111
- _ZWrite: 1
74112
m_Colors:
75-
- _Color: {r: 0.75735295, g: 0.9799189, b: 1, a: 1}
113+
- _Color: {r: 0.21193773, g: 0.77291507, b: 0.8235294, a: 1}
76114
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
115+
- _RimColor: {r: 1, g: 1, b: 1, a: 1}
116+
- _SpecColor: {r: 0.8310986, g: 0.9264706, b: 0.92252415, a: 1}
117+
- _TextureScaleOffset: {r: 1, g: 1, b: 0, a: 0}

‎Assets/HoloToolkit-Examples/Prototyping/Primitives/Materials/angleThinMaterial.mat‎

Lines changed: 44 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ Material:
77
m_PrefabParentObject: {fileID: 0}
88
m_PrefabInternal: {fileID: 0}
99
m_Name: angleThinMaterial
10-
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
11-
m_ShaderKeywords: _EMISSION
10+
m_Shader: {fileID: 4800000, guid: f1f3948b20c230044bda31b620ddd37f, type: 3}
11+
m_ShaderKeywords: _EMISSION _FORCEPERPIXEL_ON _SHADE4_ON _SPECULARHIGHLIGHTS_ON
12+
_USEAMBIENT_ON _USEDIFFUSE_ON _USEMAINCOLOR_ON _USEVERTEXCOLOR_ON
1213
m_LightmapFlags: 1
1314
m_EnableInstancingVariants: 0
1415
m_DoubleSidedGI: 0
@@ -22,6 +23,10 @@ Material:
2223
m_Texture: {fileID: 0}
2324
m_Scale: {x: 1, y: 1}
2425
m_Offset: {x: 0, y: 0}
26+
- _CubeMap:
27+
m_Texture: {fileID: 0}
28+
m_Scale: {x: 1, y: 1}
29+
m_Offset: {x: 0, y: 0}
2530
- _DetailAlbedoMap:
2631
m_Texture: {fileID: 0}
2732
m_Scale: {x: 1, y: 1}
@@ -38,6 +43,10 @@ Material:
3843
m_Texture: {fileID: 0}
3944
m_Scale: {x: 1, y: 1}
4045
m_Offset: {x: 0, y: 0}
46+
- _GlossMap:
47+
m_Texture: {fileID: 0}
48+
m_Scale: {x: 1, y: 1}
49+
m_Offset: {x: 0, y: 0}
4150
- _MainTex:
4251
m_Texture: {fileID: 0}
4352
m_Scale: {x: 1, y: 1}
@@ -54,23 +63,55 @@ Material:
5463
m_Texture: {fileID: 0}
5564
m_Scale: {x: 1, y: 1}
5665
m_Offset: {x: 0, y: 0}
66+
- _SpecularMap:
67+
m_Texture: {fileID: 0}
68+
m_Scale: {x: 1, y: 1}
69+
m_Offset: {x: 0, y: 0}
5770
m_Floats:
71+
- _AlphaTest: 0
72+
- _BlendOp: 0
5873
- _BumpScale: 1
74+
- _CalibrationSpaceReflections: 0
75+
- _ColorWriteMask: 15
76+
- _Cull: 2
5977
- _Cutoff: 0.5
6078
- _DetailNormalMapScale: 1
6179
- _DstBlend: 0
80+
- _ForcePerPixel: 1
81+
- _Gloss: 0.5
6282
- _GlossMapScale: 1
6383
- _Glossiness: 0
6484
- _GlossyReflections: 1
6585
- _Metallic: 0
6686
- _Mode: 0
6787
- _OcclusionStrength: 1
6888
- _Parallax: 0.02
89+
- _ReflectionScale: 2
90+
- _RimPower: 0.7
91+
- _Shade4: 1
6992
- _SmoothnessTextureChannel: 0
93+
- _Specular: 12
7094
- _SpecularHighlights: 1
7195
- _SrcBlend: 1
7296
- _UVSec: 0
97+
- _UseAmbient: 1
98+
- _UseBumpMap: 0
99+
- _UseDiffuse: 1
100+
- _UseEmissionColor: 0
101+
- _UseEmissionMap: 0
102+
- _UseGlossMap: 0
103+
- _UseMainColor: 1
104+
- _UseMainTex: 0
105+
- _UseOcclusionMap: 0
106+
- _UseReflections: 0
107+
- _UseRimLighting: 0
108+
- _UseSpecularMap: 0
109+
- _UseVertexColor: 1
110+
- _ZTest: 4
73111
- _ZWrite: 1
74112
m_Colors:
75-
- _Color: {r: 0.75735295, g: 0.9799189, b: 1, a: 1}
113+
- _Color: {r: 0.21193773, g: 0.77291507, b: 0.8235294, a: 1}
76114
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
115+
- _RimColor: {r: 1, g: 1, b: 1, a: 1}
116+
- _SpecColor: {r: 0.8310986, g: 0.9264706, b: 0.92252415, a: 1}
117+
- _TextureScaleOffset: {r: 1, g: 1, b: 0, a: 0}

‎Assets/HoloToolkit-Examples/Prototyping/Primitives/Materials/arrowMaterial.mat‎

Lines changed: 44 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ Material:
77
m_PrefabParentObject: {fileID: 0}
88
m_PrefabInternal: {fileID: 0}
99
m_Name: arrowMaterial
10-
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
11-
m_ShaderKeywords: _EMISSION
10+
m_Shader: {fileID: 4800000, guid: f1f3948b20c230044bda31b620ddd37f, type: 3}
11+
m_ShaderKeywords: _EMISSION _FORCEPERPIXEL_ON _SHADE4_ON _SPECULARHIGHLIGHTS_ON
12+
_USEAMBIENT_ON _USEDIFFUSE_ON _USEMAINCOLOR_ON _USEVERTEXCOLOR_ON
1213
m_LightmapFlags: 1
1314
m_EnableInstancingVariants: 0
1415
m_DoubleSidedGI: 0
@@ -22,6 +23,10 @@ Material:
2223
m_Texture: {fileID: 0}
2324
m_Scale: {x: 1, y: 1}
2425
m_Offset: {x: 0, y: 0}
26+
- _CubeMap:
27+
m_Texture: {fileID: 0}
28+
m_Scale: {x: 1, y: 1}
29+
m_Offset: {x: 0, y: 0}
2530
- _DetailAlbedoMap:
2631
m_Texture: {fileID: 0}
2732
m_Scale: {x: 1, y: 1}
@@ -38,6 +43,10 @@ Material:
3843
m_Texture: {fileID: 0}
3944
m_Scale: {x: 1, y: 1}
4045
m_Offset: {x: 0, y: 0}
46+
- _GlossMap:
47+
m_Texture: {fileID: 0}
48+
m_Scale: {x: 1, y: 1}
49+
m_Offset: {x: 0, y: 0}
4150
- _MainTex:
4251
m_Texture: {fileID: 0}
4352
m_Scale: {x: 1, y: 1}
@@ -54,23 +63,55 @@ Material:
5463
m_Texture: {fileID: 0}
5564
m_Scale: {x: 1, y: 1}
5665
m_Offset: {x: 0, y: 0}
66+
- _SpecularMap:
67+
m_Texture: {fileID: 0}
68+
m_Scale: {x: 1, y: 1}
69+
m_Offset: {x: 0, y: 0}
5770
m_Floats:
71+
- _AlphaTest: 0
72+
- _BlendOp: 0
5873
- _BumpScale: 1
74+
- _CalibrationSpaceReflections: 0
75+
- _ColorWriteMask: 15
76+
- _Cull: 2
5977
- _Cutoff: 0.5
6078
- _DetailNormalMapScale: 1
6179
- _DstBlend: 0
80+
- _ForcePerPixel: 1
81+
- _Gloss: 0.5
6282
- _GlossMapScale: 1
6383
- _Glossiness: 0
6484
- _GlossyReflections: 1
6585
- _Metallic: 0
6686
- _Mode: 0
6787
- _OcclusionStrength: 1
6888
- _Parallax: 0.02
89+
- _ReflectionScale: 2
90+
- _RimPower: 0.7
91+
- _Shade4: 1
6992
- _SmoothnessTextureChannel: 0
93+
- _Specular: 12
7094
- _SpecularHighlights: 1
7195
- _SrcBlend: 1
7296
- _UVSec: 0
97+
- _UseAmbient: 1
98+
- _UseBumpMap: 0
99+
- _UseDiffuse: 1
100+
- _UseEmissionColor: 0
101+
- _UseEmissionMap: 0
102+
- _UseGlossMap: 0
103+
- _UseMainColor: 1
104+
- _UseMainTex: 0
105+
- _UseOcclusionMap: 0
106+
- _UseReflections: 0
107+
- _UseRimLighting: 0
108+
- _UseSpecularMap: 0
109+
- _UseVertexColor: 1
110+
- _ZTest: 4
73111
- _ZWrite: 1
74112
m_Colors:
75-
- _Color: {r: 0.75735295, g: 0.9799189, b: 1, a: 1}
113+
- _Color: {r: 0.21193773, g: 0.77291507, b: 0.8235294, a: 1}
76114
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
115+
- _RimColor: {r: 1, g: 1, b: 1, a: 1}
116+
- _SpecColor: {r: 0.8310986, g: 0.9264706, b: 0.92252415, a: 1}
117+
- _TextureScaleOffset: {r: 1, g: 1, b: 0, a: 0}

0 commit comments

Comments
 (0)