Skip to content

Commit beaae2c

Browse files
StephenHodgsonStephenHodgson
authored
Merge pull request #904 from killerantz/fix/textShaders
3DTextShader instancing updates
2 parents 8ed1817 + 751d9e8 commit beaae2c

File tree

5 files changed

+255
-268
lines changed

5 files changed

+255
-268
lines changed

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

Lines changed: 55 additions & 149 deletions
Original file line numberDiff line numberDiff line change
@@ -8,192 +8,98 @@ Material:
88
m_PrefabInternal: {fileID: 0}
99
m_Name: Button
1010
m_Shader: {fileID: 4800000, guid: 7895124b9cb5e9a4a9a939d12c8134b6, type: 3}
11-
m_ShaderKeywords: _EMISSION _USEMAINTEX_ON
11+
m_ShaderKeywords: _EMISSION _TRANSPARENT_ON _USEMAINTEX_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: 2800000, guid: 42f5f2481f444394a83e04c1935331e2, type: 3}
5847
m_Scale: {x: 1, y: 1}
5948
m_Offset: {x: 0, y: 0}
60-
- first:
61-
name: _MainTex1
62-
second:
49+
- _MainTex1:
6350
m_Texture: {fileID: 0}
6451
m_Scale: {x: 1, y: 1}
6552
m_Offset: {x: 0, y: 0}
66-
- first:
67-
name: _MetallicGlossMap
68-
second:
53+
- _MetallicGlossMap:
6954
m_Texture: {fileID: 0}
7055
m_Scale: {x: 1, y: 1}
7156
m_Offset: {x: 0, y: 0}
72-
- first:
73-
name: _OcclusionMap
74-
second:
57+
- _OcclusionMap:
7558
m_Texture: {fileID: 0}
7659
m_Scale: {x: 1, y: 1}
7760
m_Offset: {x: 0, y: 0}
78-
- first:
79-
name: _ParallaxMap
80-
second:
61+
- _ParallaxMap:
8162
m_Texture: {fileID: 0}
8263
m_Scale: {x: 1, y: 1}
8364
m_Offset: {x: 0, y: 0}
8465
m_Floats:
85-
- first:
86-
name: _Ambiant
87-
second: 0.668
88-
- first:
89-
name: _Ambient
90-
second: 0.4
91-
- first:
92-
name: _BumpScale
93-
second: 1
94-
- first:
95-
name: _CameraIntensity
96-
second: 0.2
97-
- first:
98-
name: _ColorWriteMask
99-
second: 15
100-
- first:
101-
name: _Cull
102-
second: 2
103-
- first:
104-
name: _Cutoff
105-
second: 0.5
106-
- first:
107-
name: _DetailNormalMapScale
108-
second: 1
109-
- first:
110-
name: _DstBlend
111-
second: 0
112-
- first:
113-
name: _GlossMapScale
114-
second: 1
115-
- first:
116-
name: _Glossiness
117-
second: 0.5
118-
- first:
119-
name: _GlossyReflections
120-
second: 1
121-
- first:
122-
name: _Highlight
123-
second: 0
124-
- first:
125-
name: _HighlightX
126-
second: 0
127-
- first:
128-
name: _HighlightY
129-
second: 0.892
130-
- first:
131-
name: _HighlightZ
132-
second: 0.975
133-
- first:
134-
name: _LightIntensity
135-
second: 1
136-
- first:
137-
name: _Metallic
138-
second: 0
139-
- first:
140-
name: _Mode
141-
second: 0
142-
- first:
143-
name: _OcclusionStrength
144-
second: 1
145-
- first:
146-
name: _Parallax
147-
second: 0.02
148-
- first:
149-
name: _Shininess
150-
second: 3
151-
- first:
152-
name: _SmoothnessTextureChannel
153-
second: 0
154-
- first:
155-
name: _SpecularHighlights
156-
second: 1
157-
- first:
158-
name: _SrcBlend
159-
second: 0
160-
- first:
161-
name: _UVSec
162-
second: 0
163-
- first:
164-
name: _UseBumpMap
165-
second: 0
166-
- first:
167-
name: _UseColor
168-
second: 0
169-
- first:
170-
name: _UseEmissionTex
171-
second: 0
172-
- first:
173-
name: _UseMainTex
174-
second: 1
175-
- first:
176-
name: _ZTest
177-
second: 4
178-
- first:
179-
name: _ZWrite
180-
second: 1
66+
- _Ambiant: 0.668
67+
- _Ambient: 0.4
68+
- _BumpScale: 1
69+
- _CameraIntensity: 0.2
70+
- _ColorWriteMask: 15
71+
- _Cull: 2
72+
- _Cutoff: 0.5
73+
- _DetailNormalMapScale: 1
74+
- _DstBlend: 0
75+
- _GlossMapScale: 1
76+
- _Glossiness: 0.5
77+
- _GlossyReflections: 1
78+
- _Highlight: 0
79+
- _HighlightX: 0
80+
- _HighlightY: 0.892
81+
- _HighlightZ: 0.975
82+
- _LightIntensity: 1
83+
- _Metallic: 0
84+
- _Mode: 0
85+
- _OcclusionStrength: 1
86+
- _Parallax: 0.02
87+
- _Shininess: 3
88+
- _SmoothnessTextureChannel: 0
89+
- _SpecularHighlights: 1
90+
- _SrcBlend: 0
91+
- _Transparent: 1
92+
- _UVSec: 0
93+
- _UseBumpMap: 0
94+
- _UseColor: 0
95+
- _UseEmissionTex: 0
96+
- _UseMainTex: 1
97+
- _ZTest: 4
98+
- _ZWrite: 1
18199
m_Colors:
182-
- first:
183-
name: _Color
184-
second: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
185-
- first:
186-
name: _EmissionColor
187-
second: {r: 0, g: 0, b: 0, a: 1}
188-
- first:
189-
name: _Highlight
190-
second: {r: 0.103, g: 0.234, b: 0.14749132, a: 1}
191-
- first:
192-
name: _HighlightColor
193-
second: {r: 1, g: 1, b: 1, a: 1}
194-
- first:
195-
name: _LightDir
196-
second: {r: 0.3, g: 0.8, b: -0.6, a: 1}
197-
- first:
198-
name: _Specular
199-
second: {r: 0.08, g: 0.075, b: 0.065, a: 1}
100+
- _Color: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
101+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
102+
- _Highlight: {r: 0.103, g: 0.234, b: 0.14749132, a: 1}
103+
- _HighlightColor: {r: 1, g: 1, b: 1, a: 1}
104+
- _LightDir: {r: 0.3, g: 0.8, b: -0.6, a: 1}
105+
- _Specular: {r: 0.08, g: 0.075, b: 0.065, a: 1}

‎Assets/HoloToolkit-Examples/InteractiveElements/Scenes/InteractiveButtonComponents.unity‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ OcclusionCullingSettings:
1313
--- !u!104 &2
1414
RenderSettings:
1515
m_ObjectHideFlags: 0
16-
serializedVersion: 7
16+
serializedVersion: 8
1717
m_Fog: 0
1818
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
1919
m_FogMode: 3
@@ -25,6 +25,7 @@ RenderSettings:
2525
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
2626
m_AmbientIntensity: 1
2727
m_AmbientMode: 0
28+
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
2829
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
2930
m_HaloStrength: 0.5
3031
m_FlareStrength: 1
@@ -41,7 +42,7 @@ RenderSettings:
4142
--- !u!157 &3
4243
LightmapSettings:
4344
m_ObjectHideFlags: 0
44-
serializedVersion: 7
45+
serializedVersion: 11
4546
m_GIWorkflowMode: 1
4647
m_GISettings:
4748
serializedVersion: 2
@@ -53,7 +54,7 @@ LightmapSettings:
5354
m_EnableBakedLightmaps: 1
5455
m_EnableRealtimeLightmaps: 1
5556
m_LightmapEditorSettings:
56-
serializedVersion: 4
57+
serializedVersion: 9
5758
m_Resolution: 2
5859
m_BakeResolution: 40
5960
m_TextureWidth: 1024
@@ -66,13 +67,27 @@ LightmapSettings:
6667
m_LightmapParameters: {fileID: 0}
6768
m_LightmapsBakeMode: 1
6869
m_TextureCompression: 1
69-
m_DirectLightInLightProbes: 1
7070
m_FinalGather: 0
7171
m_FinalGatherFiltering: 1
7272
m_FinalGatherRayCount: 256
7373
m_ReflectionCompression: 2
74+
m_MixedBakeMode: 1
75+
m_BakeBackend: 0
76+
m_PVRSampling: 1
77+
m_PVRDirectSampleCount: 32
78+
m_PVRSampleCount: 500
79+
m_PVRBounces: 2
80+
m_PVRFiltering: 0
81+
m_PVRFilteringMode: 1
82+
m_PVRCulling: 1
83+
m_PVRFilteringGaussRadiusDirect: 1
84+
m_PVRFilteringGaussRadiusIndirect: 5
85+
m_PVRFilteringGaussRadiusAO: 2
86+
m_PVRFilteringAtrousColorSigma: 1
87+
m_PVRFilteringAtrousNormalSigma: 1
88+
m_PVRFilteringAtrousPositionSigma: 1
7489
m_LightingDataAsset: {fileID: 0}
75-
m_RuntimeCPUUsage: 25
90+
m_UseShadowmask: 0
7691
--- !u!196 &4
7792
NavMeshSettings:
7893
serializedVersion: 2
@@ -89,6 +104,8 @@ NavMeshSettings:
89104
minRegionArea: 2
90105
manualCellSize: 0
91106
cellSize: 0.16666667
107+
manualTileSize: 0
108+
tileSize: 256
92109
accuratePlacement: 0
93110
m_NavMeshData: {fileID: 0}
94111
--- !u!1001 &138317576
@@ -559,7 +576,7 @@ Light:
559576
m_PrefabInternal: {fileID: 0}
560577
m_GameObject: {fileID: 1829727920}
561578
m_Enabled: 1
562-
serializedVersion: 7
579+
serializedVersion: 8
563580
m_Type: 1
564581
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
565582
m_Intensity: 1
@@ -584,6 +601,8 @@ Light:
584601
m_Lightmapping: 4
585602
m_AreaSize: {x: 1, y: 1}
586603
m_BounceIntensity: 1
604+
m_ColorTemperature: 6570
605+
m_UseColorTemperature: 0
587606
m_ShadowRadius: 0
588607
m_ShadowAngle: 0
589608
--- !u!4 &1829727922

0 commit comments

Comments
 (0)