Skip to content

Commit 26daea0

Browse files
committed
Revert "update sharing with UNET example scene to use the improvements we discovered while creating Shared Mixed Reality 250"
This reverts commit 966b1e1.
1 parent 966b1e1 commit 26daea0

File tree

138 files changed

+4966
-7489
lines changed

Some content is hidden

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

138 files changed

+4966
-7489
lines changed

Assets/HoloToolkit-Examples/ColorPicker/ColorPickerMaterial.mat

Lines changed: 83 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -8,68 +8,120 @@ Material:
88
m_PrefabInternal: {fileID: 0}
99
m_Name: ColorPickerMaterial
1010
m_Shader: {fileID: 10751, guid: 0000000000000000f000000000000000, type: 0}
11-
m_ShaderKeywords: ETC1_EXTERNAL_ALPHA _EMISSION
11+
m_ShaderKeywords: _EMISSION
1212
m_LightmapFlags: 1
13-
m_EnableInstancingVariants: 0
1413
m_CustomRenderQueue: -1
1514
stringTagMap: {}
16-
disabledShaderPasses: []
1715
m_SavedProperties:
18-
serializedVersion: 3
16+
serializedVersion: 2
1917
m_TexEnvs:
20-
- _BumpMap:
18+
- first:
19+
name: _BumpMap
20+
second:
2121
m_Texture: {fileID: 0}
2222
m_Scale: {x: 1, y: 1}
2323
m_Offset: {x: 0, y: 0}
24-
- _DetailAlbedoMap:
24+
- first:
25+
name: _DetailAlbedoMap
26+
second:
2527
m_Texture: {fileID: 0}
2628
m_Scale: {x: 1, y: 1}
2729
m_Offset: {x: 0, y: 0}
28-
- _DetailMask:
30+
- first:
31+
name: _DetailMask
32+
second:
2933
m_Texture: {fileID: 0}
3034
m_Scale: {x: 1, y: 1}
3135
m_Offset: {x: 0, y: 0}
32-
- _DetailNormalMap:
36+
- first:
37+
name: _DetailNormalMap
38+
second:
3339
m_Texture: {fileID: 0}
3440
m_Scale: {x: 1, y: 1}
3541
m_Offset: {x: 0, y: 0}
36-
- _EmissionMap:
42+
- first:
43+
name: _EmissionMap
44+
second:
3745
m_Texture: {fileID: 0}
3846
m_Scale: {x: 1, y: 1}
3947
m_Offset: {x: 0, y: 0}
40-
- _MainTex:
48+
- first:
49+
name: _MainTex
50+
second:
4151
m_Texture: {fileID: 2800000, guid: cf16f25dfe78d054cbb8af699babcd63, type: 3}
4252
m_Scale: {x: 1, y: 1}
4353
m_Offset: {x: 0, y: 0}
44-
- _MetallicGlossMap:
54+
- first:
55+
name: _MetallicGlossMap
56+
second:
4557
m_Texture: {fileID: 0}
4658
m_Scale: {x: 1, y: 1}
4759
m_Offset: {x: 0, y: 0}
48-
- _OcclusionMap:
60+
- first:
61+
name: _OcclusionMap
62+
second:
4963
m_Texture: {fileID: 0}
5064
m_Scale: {x: 1, y: 1}
5165
m_Offset: {x: 0, y: 0}
52-
- _ParallaxMap:
66+
- first:
67+
name: _ParallaxMap
68+
second:
5369
m_Texture: {fileID: 0}
5470
m_Scale: {x: 1, y: 1}
5571
m_Offset: {x: 0, y: 0}
5672
m_Floats:
57-
- _BumpScale: 1
58-
- _Cutoff: 0.5
59-
- _DetailNormalMapScale: 1
60-
- _DstBlend: 0
61-
- _GlossMapScale: 1
62-
- _Glossiness: 0.5
63-
- _GlossyReflections: 1
64-
- _Metallic: 0
65-
- _Mode: 0
66-
- _OcclusionStrength: 1
67-
- _Parallax: 0.02
68-
- _SmoothnessTextureChannel: 0
69-
- _SpecularHighlights: 1
70-
- _SrcBlend: 1
71-
- _UVSec: 0
72-
- _ZWrite: 1
73+
- first:
74+
name: _BumpScale
75+
second: 1
76+
- first:
77+
name: _Cutoff
78+
second: 0.5
79+
- first:
80+
name: _DetailNormalMapScale
81+
second: 1
82+
- first:
83+
name: _DstBlend
84+
second: 0
85+
- first:
86+
name: _GlossMapScale
87+
second: 1
88+
- first:
89+
name: _Glossiness
90+
second: 0.5
91+
- first:
92+
name: _GlossyReflections
93+
second: 1
94+
- first:
95+
name: _Metallic
96+
second: 0
97+
- first:
98+
name: _Mode
99+
second: 0
100+
- first:
101+
name: _OcclusionStrength
102+
second: 1
103+
- first:
104+
name: _Parallax
105+
second: 0.02
106+
- first:
107+
name: _SmoothnessTextureChannel
108+
second: 0
109+
- first:
110+
name: _SpecularHighlights
111+
second: 1
112+
- first:
113+
name: _SrcBlend
114+
second: 1
115+
- first:
116+
name: _UVSec
117+
second: 0
118+
- first:
119+
name: _ZWrite
120+
second: 1
73121
m_Colors:
74-
- _Color: {r: 1, g: 1, b: 1, a: 1}
75-
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
122+
- first:
123+
name: _Color
124+
second: {r: 1, g: 1, b: 1, a: 1}
125+
- first:
126+
name: _EmissionColor
127+
second: {r: 0, g: 0, b: 0, a: 1}

0 commit comments

Comments
 (0)