Skip to content

Commit 097fdb2

Browse files
waywawaywa
waywa
authored and
waywa
committed
2 parents e7cb27c + ffbe05b commit 097fdb2

File tree

637 files changed

+99284
-4957
lines changed

Some content is hidden

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

637 files changed

+99284
-4957
lines changed

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Library/
1010
Assets/AssetStoreTools*
1111
App/
1212
UWP/
13+
/WindowsStoreApp
1314
project.json
1415
project.lock.json
1516

@@ -38,4 +39,5 @@ obj/
3839
*.idb
3940
*.opendb
4041
WSATestCertificate.pfx
41-
WSATestCertificate.pfx.meta
42+
WSATestCertificate.pfx.meta
43+
/Assets/HoloToolkit-Examples/FastConfigurableShader/Scenes/FastConfigurableTest

‎Assets/HoloToolkit-Examples/FastConfigurableShader/Materials.meta‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/HoloToolkit-Examples/FastConfigurableShader/Materials/Fast Configurable - Ambient Diffuse Cutout.mat‎

Lines changed: 143 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 6
6+
m_ObjectHideFlags: 0
7+
m_PrefabParentObject: {fileID: 0}
8+
m_PrefabInternal: {fileID: 0}
9+
m_Name: Fast Configurable - Ambient Diffuse Cutout
10+
m_Shader: {fileID: 4800000, guid: f1f3948b20c230044bda31b620ddd37f, type: 3}
11+
m_ShaderKeywords: _ALPHATEST_ON _EMISSION _MAINTEX_OFFSET_ON _MAINTEX_SCALE_ON _MainTex_ON
12+
_MainTex_SCALE_ON _USEAMBIENT_ON _USEDIFFUSE_ON _USEMAINTEX_ON _USESPECULAR_ON
13+
m_LightmapFlags: 1
14+
m_EnableInstancingVariants: 0
15+
m_CustomRenderQueue: 2450
16+
stringTagMap:
17+
RenderType: TransparentCutout
18+
disabledShaderPasses: []
19+
m_SavedProperties:
20+
serializedVersion: 3
21+
m_TexEnvs:
22+
- _BumpMap:
23+
m_Texture: {fileID: 0}
24+
m_Scale: {x: 1, y: 1}
25+
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}
30+
- _DetailAlbedoMap:
31+
m_Texture: {fileID: 0}
32+
m_Scale: {x: 1, y: 1}
33+
m_Offset: {x: 0, y: 0}
34+
- _DetailMask:
35+
m_Texture: {fileID: 0}
36+
m_Scale: {x: 1, y: 1}
37+
m_Offset: {x: 0, y: 0}
38+
- _DetailNormalMap:
39+
m_Texture: {fileID: 0}
40+
m_Scale: {x: 1, y: 1}
41+
m_Offset: {x: 0, y: 0}
42+
- _EmissionMap:
43+
m_Texture: {fileID: 0}
44+
m_Scale: {x: 1, y: 1}
45+
m_Offset: {x: 0, y: 0}
46+
- _EmissionTex:
47+
m_Texture: {fileID: 0}
48+
m_Scale: {x: 1, y: 1}
49+
m_Offset: {x: 0, y: 0}
50+
- _GlossMap:
51+
m_Texture: {fileID: 0}
52+
m_Scale: {x: 1, y: 1}
53+
m_Offset: {x: 0, y: 0}
54+
- _MainTex:
55+
m_Texture: {fileID: 2800000, guid: 234535ee2344257418aaf5233999897d, type: 3}
56+
m_Scale: {x: 1, y: 1}
57+
m_Offset: {x: 0, y: 0}
58+
- _MetallicGlossMap:
59+
m_Texture: {fileID: 0}
60+
m_Scale: {x: 1, y: 1}
61+
m_Offset: {x: 0, y: 0}
62+
- _OcclusionMap:
63+
m_Texture: {fileID: 0}
64+
m_Scale: {x: 1, y: 1}
65+
m_Offset: {x: 0, y: 0}
66+
- _ParallaxMap:
67+
m_Texture: {fileID: 0}
68+
m_Scale: {x: 1, y: 1}
69+
m_Offset: {x: 0, y: 0}
70+
- _SecondaryTex:
71+
m_Texture: {fileID: 0}
72+
m_Scale: {x: 1, y: 1}
73+
m_Offset: {x: 0, y: 0}
74+
- _SpecularMap:
75+
m_Texture: {fileID: 0}
76+
m_Scale: {x: 1, y: 1}
77+
m_Offset: {x: 0, y: 0}
78+
m_Floats:
79+
- _AlphaTest: 0
80+
- _BlendOp: 0
81+
- _BumpScale: 1
82+
- _CalibrationSpaceReflections: 0
83+
- _ColorWriteMask: 15
84+
- _ColorWriteMaskBack: 15
85+
- _ColorWriteMaskFront: 15
86+
- _Cull: 2
87+
- _Cutoff: 0.9
88+
- _DetailNormalMapScale: 1
89+
- _DstBlend: 0
90+
- _ForcePerPixel: 0
91+
- _Gloss: 2
92+
- _GlossAmount: 0.53
93+
- _GlossMapScale: 1
94+
- _Glossiness: 0.5
95+
- _GlossyReflections: 1
96+
- _MainTex_OFFSET: 0
97+
- _MainTex_SCALE: 1
98+
- _Metallic: 0
99+
- _Mode: 1
100+
- _OcclusionStrength: 1
101+
- _Parallax: 0.02
102+
- _ReflectionScale: 2
103+
- _RimPower: 0.7
104+
- _Shade4: 0
105+
- _SmoothnessTextureChannel: 0
106+
- _Specular: 9.2
107+
- _SpecularAmount: 100
108+
- _SpecularHighlights: 0
109+
- _SpecularPower: 40.4
110+
- _SpecularPowerAmount: 20.1
111+
- _SpecularScale: 1.73
112+
- _SrcBlend: 1
113+
- _UVSec: 0
114+
- _UseAmbient: 1
115+
- _UseBumpMap: 0
116+
- _UseDiffuse: 1
117+
- _UseEmissionColor: 0
118+
- _UseEmissionMap: 0
119+
- _UseEmissionTex: 0
120+
- _UseGlossMap: 0
121+
- _UseMainColor: 0
122+
- _UseMainTex: 1
123+
- _UseOcclusionMap: 0
124+
- _UseReflections: 0
125+
- _UseRimLighting: 0
126+
- _UseSecondaryTex: 0
127+
- _UseSpecular: 1
128+
- _UseSpecularMap: 0
129+
- _UseTextureOffset: 0
130+
- _UseTextureScale: 0
131+
- _UseVertexColor: 0
132+
- _ZTest: 4
133+
- _ZWrite: 1
134+
m_Colors:
135+
- _Color: {r: 1, g: 0.39310342, b: 0, a: 1}
136+
- _EmissionColor: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 1}
137+
- _RimColor: {r: 1, g: 1, b: 1, a: 1}
138+
- _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
139+
- _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
140+
- _TextureScaleOffset: {r: 5, g: 5, b: 0, a: 0}
141+
- _Vec: {r: 0, g: 0, b: 0, a: 0}
142+
- _Vec2: {r: 0, g: 0, b: 0, a: 0}
143+
- _Vec3: {r: 0, g: 0, b: 0, a: 0}

‎Assets/HoloToolkit-Examples/FastConfigurableShader/Materials/Fast Configurable - Ambient Diffuse Cutout.mat.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/HoloToolkit-Examples/FastConfigurableShader/Materials/Fast Configurable - Ambient Diffuse Emission Mapped.mat‎

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 6
6+
m_ObjectHideFlags: 0
7+
m_PrefabParentObject: {fileID: 0}
8+
m_PrefabInternal: {fileID: 0}
9+
m_Name: Fast Configurable - Ambient Diffuse Emission Mapped
10+
m_Shader: {fileID: 4800000, guid: f1f3948b20c230044bda31b620ddd37f, type: 3}
11+
m_ShaderKeywords: _EMISSION _FORCEPERPIXEL_ON _MAINTEX_OFFSET_ON _MAINTEX_SCALE_ON
12+
_MainTex_ON _USEAMBIENT_ON _USEDIFFUSE_ON _USEMAINTEX_ON _USEMISSIONMAP_ON
13+
m_LightmapFlags: 1
14+
m_EnableInstancingVariants: 0
15+
m_CustomRenderQueue: -1
16+
stringTagMap: {}
17+
disabledShaderPasses: []
18+
m_SavedProperties:
19+
serializedVersion: 3
20+
m_TexEnvs:
21+
- _BumpMap:
22+
m_Texture: {fileID: 0}
23+
m_Scale: {x: 1, y: 1}
24+
m_Offset: {x: 0, y: 0}
25+
- _CubeMap:
26+
m_Texture: {fileID: 0}
27+
m_Scale: {x: 1, y: 1}
28+
m_Offset: {x: 0, y: 0}
29+
- _DetailAlbedoMap:
30+
m_Texture: {fileID: 0}
31+
m_Scale: {x: 1, y: 1}
32+
m_Offset: {x: 0, y: 0}
33+
- _DetailMask:
34+
m_Texture: {fileID: 0}
35+
m_Scale: {x: 1, y: 1}
36+
m_Offset: {x: 0, y: 0}
37+
- _DetailNormalMap:
38+
m_Texture: {fileID: 0}
39+
m_Scale: {x: 1, y: 1}
40+
m_Offset: {x: 0, y: 0}
41+
- _EmissionMap:
42+
m_Texture: {fileID: 2800000, guid: 48a1de9e9e7992547bcd03f817b4af3d, type: 3}
43+
m_Scale: {x: 1, y: 1}
44+
m_Offset: {x: 0, y: 0}
45+
- _EmissionTex:
46+
m_Texture: {fileID: 0}
47+
m_Scale: {x: 1, y: 1}
48+
m_Offset: {x: 0, y: 0}
49+
- _GlossMap:
50+
m_Texture: {fileID: 0}
51+
m_Scale: {x: 1, y: 1}
52+
m_Offset: {x: 0, y: 0}
53+
- _MainTex:
54+
m_Texture: {fileID: 2800000, guid: c8ed35a34d9a6ce4185c73f2bd52f7ad, type: 3}
55+
m_Scale: {x: 1, y: 1}
56+
m_Offset: {x: 0, y: 0}
57+
- _MetallicGlossMap:
58+
m_Texture: {fileID: 0}
59+
m_Scale: {x: 1, y: 1}
60+
m_Offset: {x: 0, y: 0}
61+
- _OcclusionMap:
62+
m_Texture: {fileID: 0}
63+
m_Scale: {x: 1, y: 1}
64+
m_Offset: {x: 0, y: 0}
65+
- _ParallaxMap:
66+
m_Texture: {fileID: 0}
67+
m_Scale: {x: 1, y: 1}
68+
m_Offset: {x: 0, y: 0}
69+
- _SecondaryTex:
70+
m_Texture: {fileID: 0}
71+
m_Scale: {x: 1, y: 1}
72+
m_Offset: {x: 0, y: 0}
73+
- _SpecularMap:
74+
m_Texture: {fileID: 0}
75+
m_Scale: {x: 1, y: 1}
76+
m_Offset: {x: 0, y: 0}
77+
m_Floats:
78+
- _AlphaTest: 0
79+
- _BlendOp: 0
80+
- _BumpScale: 1
81+
- _CalibrationSpaceReflections: 0
82+
- _ColorWriteMask: 15
83+
- _Cull: 2
84+
- _Cutoff: 0.5
85+
- _DetailNormalMapScale: 1
86+
- _DstBlend: 0
87+
- _ForcePerPixel: 1
88+
- _Gloss: 1
89+
- _GlossAmount: 0.53
90+
- _GlossMapScale: 1
91+
- _Glossiness: 0.5
92+
- _GlossyReflections: 1
93+
- _MainTex_OFFSET: 1
94+
- _MainTex_SCALE: 1
95+
- _Metallic: 0
96+
- _Mode: 0
97+
- _OcclusionStrength: 1
98+
- _Parallax: 0.02
99+
- _ReflectionScale: 2
100+
- _RimPower: 0.7
101+
- _Shade4: 0
102+
- _SmoothnessTextureChannel: 0
103+
- _Specular: 10
104+
- _SpecularAmount: 100
105+
- _SpecularHighlights: 0
106+
- _SpecularPower: 40.4
107+
- _SpecularPowerAmount: 20.1
108+
- _SpecularScale: 1.73
109+
- _SrcBlend: 1
110+
- _UVSec: 0
111+
- _UseAmbient: 1
112+
- _UseBumpMap: 0
113+
- _UseDiffuse: 1
114+
- _UseEmissionColor: 0
115+
- _UseEmissionMap: 0
116+
- _UseEmissionTex: 0
117+
- _UseGlossMap: 0
118+
- _UseMainColor: 0
119+
- _UseMainTex: 1
120+
- _UseOcclusionMap: 0
121+
- _UseReflections: 0
122+
- _UseRimLighting: 0
123+
- _UseSecondaryTex: 0
124+
- _UseSpecular: 0
125+
- _UseSpecularMap: 0
126+
- _UseTextureOffset: 0
127+
- _UseTextureScale: 0
128+
- _UseVertexColor: 0
129+
- _ZTest: 4
130+
- _ZWrite: 1
131+
m_Colors:
132+
- _Color: {r: 0, g: 0, b: 0, a: 1}
133+
- _EmissionColor: {r: 0.44117647, g: 0.25627163, b: 0.25627163, a: 1}
134+
- _RimColor: {r: 1, g: 1, b: 1, a: 1}
135+
- _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
136+
- _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
137+
- _TextureScaleOffset: {r: 1, g: 1, b: 0, a: 0}
138+
- _Vec: {r: 0, g: 0, b: 0, a: 0}
139+
- _Vec2: {r: 0, g: 0, b: 0, a: 0}
140+
- _Vec3: {r: 0, g: 0, b: 0, a: 0}

Assets/HoloToolkit-Examples/FastConfigurableShader/Materials/Fast Configurable - Ambient Diffuse Highlighted.mat.meta renamed to Assets/HoloToolkit-Examples/FastConfigurableShader/Materials/Fast Configurable - Ambient Diffuse Emission Mapped.mat.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)