Skip to content

Commit ddad5aa

Browse files
StephenHodgsonStephenHodgson
committed
Merge branch 'MRTK-Master' into HTK-WorldAnchorManagerUpdate
2 parents 0236999 + 05b46cb commit ddad5aa

File tree

175 files changed

+20299
-237
lines changed

Some content is hidden

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

175 files changed

+20299
-237
lines changed

‎Assets/HoloToolkit-Examples/InteractiveElements/Materials/Controls/RadialDot.mat‎

Lines changed: 43 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -10,157 +10,82 @@ Material:
1010
m_Shader: {fileID: 4800000, guid: 7895124b9cb5e9a4a9a939d12c8134b6, type: 3}
1111
m_ShaderKeywords: _EMISSION _USECOLOR_ON
1212
m_LightmapFlags: 1
13+
m_EnableInstancingVariants: 0
14+
m_DoubleSidedGI: 0
1315
m_CustomRenderQueue: -1
1416
stringTagMap: {}
17+
disabledShaderPasses: []
1518
m_SavedProperties:
16-
serializedVersion: 2
19+
serializedVersion: 3
1720
m_TexEnvs:
18-
- first:
19-
name: _BumpMap
20-
second:
21+
- _BumpMap:
2122
m_Texture: {fileID: 0}
2223
m_Scale: {x: 1, y: 1}
2324
m_Offset: {x: 0, y: 0}
24-
- first:
25-
name: _DetailAlbedoMap
26-
second:
25+
- _DetailAlbedoMap:
2726
m_Texture: {fileID: 0}
2827
m_Scale: {x: 1, y: 1}
2928
m_Offset: {x: 0, y: 0}
30-
- first:
31-
name: _DetailMask
32-
second:
29+
- _DetailMask:
3330
m_Texture: {fileID: 0}
3431
m_Scale: {x: 1, y: 1}
3532
m_Offset: {x: 0, y: 0}
36-
- first:
37-
name: _DetailNormalMap
38-
second:
33+
- _DetailNormalMap:
3934
m_Texture: {fileID: 0}
4035
m_Scale: {x: 1, y: 1}
4136
m_Offset: {x: 0, y: 0}
42-
- first:
43-
name: _EmissionMap
44-
second:
37+
- _EmissionMap:
4538
m_Texture: {fileID: 0}
4639
m_Scale: {x: 1, y: 1}
4740
m_Offset: {x: 0, y: 0}
48-
- first:
49-
name: _EmissionTex
50-
second:
41+
- _EmissionTex:
5142
m_Texture: {fileID: 0}
5243
m_Scale: {x: 1, y: 1}
5344
m_Offset: {x: 0, y: 0}
54-
- first:
55-
name: _MainTex
56-
second:
45+
- _MainTex:
5746
m_Texture: {fileID: 0}
5847
m_Scale: {x: 1, y: 1}
5948
m_Offset: {x: 0, y: 0}
60-
- first:
61-
name: _MetallicGlossMap
62-
second:
49+
- _MetallicGlossMap:
6350
m_Texture: {fileID: 0}
6451
m_Scale: {x: 1, y: 1}
6552
m_Offset: {x: 0, y: 0}
66-
- first:
67-
name: _OcclusionMap
68-
second:
53+
- _OcclusionMap:
6954
m_Texture: {fileID: 0}
7055
m_Scale: {x: 1, y: 1}
7156
m_Offset: {x: 0, y: 0}
72-
- first:
73-
name: _ParallaxMap
74-
second:
57+
- _ParallaxMap:
7558
m_Texture: {fileID: 0}
7659
m_Scale: {x: 1, y: 1}
7760
m_Offset: {x: 0, y: 0}
7861
m_Floats:
79-
- first:
80-
name: _Ambient
81-
second: 0.8
82-
- first:
83-
name: _BumpScale
84-
second: 1
85-
- first:
86-
name: _CameraIntensity
87-
second: 0.2
88-
- first:
89-
name: _ColorWriteMask
90-
second: 15
91-
- first:
92-
name: _Cull
93-
second: 2
94-
- first:
95-
name: _Cutoff
96-
second: 0.5
97-
- first:
98-
name: _DetailNormalMapScale
99-
second: 1
100-
- first:
101-
name: _DstBlend
102-
second: 0
103-
- first:
104-
name: _GlossMapScale
105-
second: 1
106-
- first:
107-
name: _Glossiness
108-
second: 0.5
109-
- first:
110-
name: _GlossyReflections
111-
second: 1
112-
- first:
113-
name: _LightIntensity
114-
second: 1
115-
- first:
116-
name: _Metallic
117-
second: 0
118-
- first:
119-
name: _Mode
120-
second: 0
121-
- first:
122-
name: _OcclusionStrength
123-
second: 1
124-
- first:
125-
name: _Parallax
126-
second: 0.02
127-
- first:
128-
name: _SmoothnessTextureChannel
129-
second: 0
130-
- first:
131-
name: _SpecularHighlights
132-
second: 1
133-
- first:
134-
name: _SrcBlend
135-
second: 1
136-
- first:
137-
name: _UVSec
138-
second: 0
139-
- first:
140-
name: _UseBumpMap
141-
second: 0
142-
- first:
143-
name: _UseColor
144-
second: 1
145-
- first:
146-
name: _UseEmissionTex
147-
second: 0
148-
- first:
149-
name: _UseMainTex
150-
second: 0
151-
- first:
152-
name: _ZTest
153-
second: 4
154-
- first:
155-
name: _ZWrite
156-
second: 1
62+
- _Ambient: 0.8
63+
- _BumpScale: 1
64+
- _CameraIntensity: 0.2
65+
- _ColorWriteMask: 15
66+
- _Cull: 2
67+
- _Cutoff: 0.5
68+
- _DetailNormalMapScale: 1
69+
- _DstBlend: 0
70+
- _GlossMapScale: 1
71+
- _Glossiness: 0.5
72+
- _GlossyReflections: 1
73+
- _LightIntensity: 1
74+
- _Metallic: 0
75+
- _Mode: 0
76+
- _OcclusionStrength: 1
77+
- _Parallax: 0.02
78+
- _SmoothnessTextureChannel: 0
79+
- _SpecularHighlights: 1
80+
- _SrcBlend: 1
81+
- _UVSec: 0
82+
- _UseBumpMap: 0
83+
- _UseColor: 1
84+
- _UseEmissionTex: 0
85+
- _UseMainTex: 0
86+
- _ZTest: 4
87+
- _ZWrite: 1
15788
m_Colors:
158-
- first:
159-
name: _Color
160-
second: {r: 0.90196085, g: 0.90196085, b: 0.90196085, a: 1}
161-
- first:
162-
name: _EmissionColor
163-
second: {r: 0, g: 0, b: 0, a: 1}
164-
- first:
165-
name: _LightDir
166-
second: {r: 0.3, g: 0.8, b: -0.6, a: 1}
89+
- _Color: {r: 0.90196085, g: 0.90196085, b: 0.90196085, a: 1}
90+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
91+
- _LightDir: {r: 0.3, g: 0.8, b: -0.6, a: 1}

‎Assets/HoloToolkit-Examples/Prototyping/Materials/Button3DTextSelawik.mat‎

Lines changed: 34 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -10,127 +10,70 @@ Material:
1010
m_Shader: {fileID: 4800000, guid: cfe12bbf45a06fb4b8fce6adb726485f, type: 3}
1111
m_ShaderKeywords:
1212
m_LightmapFlags: 5
13+
m_EnableInstancingVariants: 0
14+
m_DoubleSidedGI: 0
1315
m_CustomRenderQueue: -1
1416
stringTagMap: {}
17+
disabledShaderPasses: []
1518
m_SavedProperties:
16-
serializedVersion: 2
19+
serializedVersion: 3
1720
m_TexEnvs:
18-
- first:
19-
name: _BumpMap
20-
second:
21+
- _BumpMap:
2122
m_Texture: {fileID: 0}
2223
m_Scale: {x: 1, y: 1}
2324
m_Offset: {x: 0, y: 0}
24-
- first:
25-
name: _DetailAlbedoMap
26-
second:
25+
- _DetailAlbedoMap:
2726
m_Texture: {fileID: 0}
2827
m_Scale: {x: 1, y: 1}
2928
m_Offset: {x: 0, y: 0}
30-
- first:
31-
name: _DetailMask
32-
second:
29+
- _DetailMask:
3330
m_Texture: {fileID: 0}
3431
m_Scale: {x: 1, y: 1}
3532
m_Offset: {x: 0, y: 0}
36-
- first:
37-
name: _DetailNormalMap
38-
second:
33+
- _DetailNormalMap:
3934
m_Texture: {fileID: 0}
4035
m_Scale: {x: 1, y: 1}
4136
m_Offset: {x: 0, y: 0}
42-
- first:
43-
name: _EmissionMap
44-
second:
37+
- _EmissionMap:
4538
m_Texture: {fileID: 0}
4639
m_Scale: {x: 1, y: 1}
4740
m_Offset: {x: 0, y: 0}
48-
- first:
49-
name: _MainTex
50-
second:
41+
- _MainTex:
5142
m_Texture: {fileID: 2800000, guid: 86574c70442309b45be5a1c37a37a40b, type: 3}
5243
m_Scale: {x: 1, y: 1}
5344
m_Offset: {x: 0, y: 0}
54-
- first:
55-
name: _MetallicGlossMap
56-
second:
45+
- _MetallicGlossMap:
5746
m_Texture: {fileID: 0}
5847
m_Scale: {x: 1, y: 1}
5948
m_Offset: {x: 0, y: 0}
60-
- first:
61-
name: _OcclusionMap
62-
second:
49+
- _OcclusionMap:
6350
m_Texture: {fileID: 0}
6451
m_Scale: {x: 1, y: 1}
6552
m_Offset: {x: 0, y: 0}
66-
- first:
67-
name: _ParallaxMap
68-
second:
53+
- _ParallaxMap:
6954
m_Texture: {fileID: 0}
7055
m_Scale: {x: 1, y: 1}
7156
m_Offset: {x: 0, y: 0}
7257
m_Floats:
73-
- first:
74-
name: _BumpScale
75-
second: 1
76-
- first:
77-
name: _ColorMask
78-
second: 15
79-
- first:
80-
name: _Cutoff
81-
second: 0.5
82-
- first:
83-
name: _DetailNormalMapScale
84-
second: 1
85-
- first:
86-
name: _DstBlend
87-
second: 0
88-
- first:
89-
name: _Glossiness
90-
second: 0.5
91-
- first:
92-
name: _Metallic
93-
second: 0
94-
- first:
95-
name: _Mode
96-
second: 0
97-
- first:
98-
name: _OcclusionStrength
99-
second: 1
100-
- first:
101-
name: _Parallax
102-
second: 0.02
103-
- first:
104-
name: _SrcBlend
105-
second: 1
106-
- first:
107-
name: _Stencil
108-
second: 0
109-
- first:
110-
name: _StencilComp
111-
second: 8
112-
- first:
113-
name: _StencilOp
114-
second: 0
115-
- first:
116-
name: _StencilReadMask
117-
second: 255
118-
- first:
119-
name: _StencilWriteMask
120-
second: 255
121-
- first:
122-
name: _UVSec
123-
second: 0
124-
- first:
125-
name: _UseUIAlphaClip
126-
second: 0
127-
- first:
128-
name: _ZWrite
129-
second: 1
58+
- _BumpScale: 1
59+
- _ColorMask: 15
60+
- _Cutoff: 0.5
61+
- _DetailNormalMapScale: 1
62+
- _DstBlend: 0
63+
- _Glossiness: 0.5
64+
- _Metallic: 0
65+
- _Mode: 0
66+
- _OcclusionStrength: 1
67+
- _Parallax: 0.02
68+
- _SrcBlend: 1
69+
- _Stencil: 0
70+
- _StencilComp: 8
71+
- _StencilOp: 0
72+
- _StencilReadMask: 255
73+
- _StencilWriteMask: 255
74+
- _UVSec: 0
75+
- _UseUIAlphaClip: 0
76+
- _ZWrite: 1
13077
m_Colors:
131-
- first:
132-
name: _Color
133-
second: {r: 1, g: 1, b: 1, a: 1}
134-
- first:
135-
name: _EmissionColor
136-
second: {r: 0, g: 0, b: 0, a: 1}
78+
- _Color: {r: 1, g: 1, b: 1, a: 1}
79+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

‎Assets/HoloToolkit-Examples/Prototyping/Primitives.meta‎

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

‎Assets/HoloToolkit-Examples/Prototyping/Primitives/Materials.meta‎

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

0 commit comments

Comments
 (0)