Skip to content

Commit dff6426

Browse files
daraxdarax
committed
switch default material to a HoloToolkit_Default Material
Remove the tiny sphere from the cursor off holograms
1 parent 41407ab commit dff6426

26 files changed

+471
-165
lines changed

‎Assets/HoloToolkit-Examples/GazeRuler/Materials/Brush.mat‎

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ Material:
77
m_PrefabParentObject: {fileID: 0}
88
m_PrefabInternal: {fileID: 0}
99
m_Name: Brush
10-
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
11-
m_ShaderKeywords: _EMISSION
10+
m_Shader: {fileID: 4800000, guid: 0118fa4f1c88b4640b193eca2c181644, type: 3}
11+
m_ShaderKeywords: _EMISSION _USECOLOR_ON
1212
m_LightmapFlags: 1
1313
m_CustomRenderQueue: -1
1414
stringTagMap: {}
@@ -45,6 +45,12 @@ Material:
4545
m_Texture: {fileID: 0}
4646
m_Scale: {x: 1, y: 1}
4747
m_Offset: {x: 0, y: 0}
48+
- first:
49+
name: _EmissionTex
50+
second:
51+
m_Texture: {fileID: 0}
52+
m_Scale: {x: 1, y: 1}
53+
m_Offset: {x: 0, y: 0}
4854
- first:
4955
name: _MainTex
5056
second:
@@ -73,6 +79,12 @@ Material:
7379
- first:
7480
name: _BumpScale
7581
second: 1
82+
- first:
83+
name: _ColorWriteMask
84+
second: 15
85+
- first:
86+
name: _Cull
87+
second: 2
7688
- first:
7789
name: _Cutoff
7890
second: 0.5
@@ -82,6 +94,9 @@ Material:
8294
- first:
8395
name: _DstBlend
8496
second: 0
97+
- first:
98+
name: _Gloss
99+
second: 0.5
85100
- first:
86101
name: _GlossMapScale
87102
second: 1
@@ -106,6 +121,9 @@ Material:
106121
- first:
107122
name: _SmoothnessTextureChannel
108123
second: 0
124+
- first:
125+
name: _Specular
126+
second: 0.5
109127
- first:
110128
name: _SpecularHighlights
111129
second: 1
@@ -115,6 +133,21 @@ Material:
115133
- first:
116134
name: _UVSec
117135
second: 0
136+
- first:
137+
name: _UseBumpMap
138+
second: 0
139+
- first:
140+
name: _UseColor
141+
second: 1
142+
- first:
143+
name: _UseEmissionTex
144+
second: 0
145+
- first:
146+
name: _UseMainTex
147+
second: 0
148+
- first:
149+
name: _ZTest
150+
second: 4
118151
- first:
119152
name: _ZWrite
120153
second: 1
@@ -125,3 +158,6 @@ Material:
125158
- first:
126159
name: _EmissionColor
127160
second: {r: 0, g: 0, b: 0, a: 1}
161+
- first:
162+
name: _SpecColor
163+
second: {r: 0.5, g: 0.5, b: 0.5, a: 1}

‎Assets/HoloToolkit-Examples/GazeRuler/Scenes/GazeRulerTest.unity‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ MeshRenderer:
121121
m_LightProbeUsage: 1
122122
m_ReflectionProbeUsage: 1
123123
m_Materials:
124-
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
124+
- {fileID: 2100000, guid: 474f0e0481d4aa14e92a5ada98042f3a, type: 2}
125125
m_SubsetIndices:
126126
m_StaticBatchRoot: {fileID: 0}
127127
m_ProbeAnchor: {fileID: 0}
@@ -130,6 +130,7 @@ MeshRenderer:
130130
m_PreserveUVs: 1
131131
m_IgnoreNormalsForChartDetection: 0
132132
m_ImportantGI: 0
133+
m_SelectedWireframeHidden: 0
133134
m_MinimumChartSize: 4
134135
m_AutoUVMaxDistance: 0.5
135136
m_AutoUVMaxAngle: 89
@@ -164,10 +165,10 @@ Transform:
164165
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
165166
m_LocalPosition: {x: 0, y: 0, z: 2}
166167
m_LocalScale: {x: 1, y: 1, z: 1}
168+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
167169
m_Children: []
168170
m_Father: {fileID: 0}
169171
m_RootOrder: 2
170-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
171172
--- !u!1 &1163630130
172173
GameObject:
173174
m_ObjectHideFlags: 0
@@ -199,7 +200,7 @@ MeshRenderer:
199200
m_LightProbeUsage: 1
200201
m_ReflectionProbeUsage: 1
201202
m_Materials:
202-
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
203+
- {fileID: 2100000, guid: 474f0e0481d4aa14e92a5ada98042f3a, type: 2}
203204
m_SubsetIndices:
204205
m_StaticBatchRoot: {fileID: 0}
205206
m_ProbeAnchor: {fileID: 0}
@@ -208,6 +209,7 @@ MeshRenderer:
208209
m_PreserveUVs: 1
209210
m_IgnoreNormalsForChartDetection: 0
210211
m_ImportantGI: 0
212+
m_SelectedWireframeHidden: 0
211213
m_MinimumChartSize: 4
212214
m_AutoUVMaxDistance: 0.5
213215
m_AutoUVMaxAngle: 89
@@ -242,10 +244,10 @@ Transform:
242244
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
243245
m_LocalPosition: {x: -0.24500847, y: -0.92795813, z: 0.4604621}
244246
m_LocalScale: {x: 1, y: 1, z: 1}
247+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
245248
m_Children: []
246249
m_Father: {fileID: 0}
247250
m_RootOrder: 3
248-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
249251
--- !u!1 &1662911037
250252
GameObject:
251253
m_ObjectHideFlags: 0
@@ -277,7 +279,7 @@ MeshRenderer:
277279
m_LightProbeUsage: 1
278280
m_ReflectionProbeUsage: 1
279281
m_Materials:
280-
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
282+
- {fileID: 2100000, guid: 474f0e0481d4aa14e92a5ada98042f3a, type: 2}
281283
m_SubsetIndices:
282284
m_StaticBatchRoot: {fileID: 0}
283285
m_ProbeAnchor: {fileID: 0}
@@ -286,6 +288,7 @@ MeshRenderer:
286288
m_PreserveUVs: 1
287289
m_IgnoreNormalsForChartDetection: 0
288290
m_ImportantGI: 0
291+
m_SelectedWireframeHidden: 0
289292
m_MinimumChartSize: 4
290293
m_AutoUVMaxDistance: 0.5
291294
m_AutoUVMaxAngle: 89
@@ -320,10 +323,10 @@ Transform:
320323
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
321324
m_LocalPosition: {x: 0, y: 0, z: 5.629}
322325
m_LocalScale: {x: 1, y: 1, z: 1}
326+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
323327
m_Children: []
324328
m_Father: {fileID: 0}
325329
m_RootOrder: 4
326-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
327330
--- !u!1 &1729612643
328331
GameObject:
329332
m_ObjectHideFlags: 0
@@ -384,6 +387,7 @@ MeshRenderer:
384387
m_PreserveUVs: 0
385388
m_IgnoreNormalsForChartDetection: 0
386389
m_ImportantGI: 0
390+
m_SelectedWireframeHidden: 0
387391
m_MinimumChartSize: 4
388392
m_AutoUVMaxDistance: 0.5
389393
m_AutoUVMaxAngle: 89
@@ -399,10 +403,10 @@ Transform:
399403
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
400404
m_LocalPosition: {x: -0.007145919, y: -0.013299882, z: 0.015558016}
401405
m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
406+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
402407
m_Children: []
403408
m_Father: {fileID: 0}
404409
m_RootOrder: 5
405-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
406410
--- !u!1 &1732809535
407411
GameObject:
408412
m_ObjectHideFlags: 0
@@ -436,6 +440,7 @@ Light:
436440
m_Shadows:
437441
m_Type: 2
438442
m_Resolution: -1
443+
m_CustomResolution: -1
439444
m_Strength: 1
440445
m_Bias: 0.05
441446
m_NormalBias: 0.4
@@ -461,10 +466,10 @@ Transform:
461466
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
462467
m_LocalPosition: {x: 0, y: 3, z: 0}
463468
m_LocalScale: {x: 1, y: 1, z: 1}
469+
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
464470
m_Children: []
465471
m_Father: {fileID: 0}
466472
m_RootOrder: 1
467-
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
468473
--- !u!1 &1951689217
469474
GameObject:
470475
m_ObjectHideFlags: 0
@@ -564,7 +569,7 @@ Transform:
564569
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
565570
m_LocalPosition: {x: 0, y: 1, z: -10}
566571
m_LocalScale: {x: 1, y: 1, z: 1}
572+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
567573
m_Children: []
568574
m_Father: {fileID: 0}
569575
m_RootOrder: 0
570-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

‎Assets/HoloToolkit-Examples/SpatialMappingComponent/SpatialMappingExample.unity‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ RenderSettings:
3737
m_ReflectionIntensity: 1
3838
m_CustomReflection: {fileID: 0}
3939
m_Sun: {fileID: 0}
40-
m_IndirectSpecularColor: {r: 0.44692534, g: 0.4967872, b: 0.57508564, a: 1}
40+
m_IndirectSpecularColor: {r: 0.44692558, g: 0.49678743, b: 0.57508624, a: 1}
4141
--- !u!157 &3
4242
LightmapSettings:
4343
m_ObjectHideFlags: 0
@@ -122,7 +122,7 @@ MeshRenderer:
122122
m_LightProbeUsage: 1
123123
m_ReflectionProbeUsage: 1
124124
m_Materials:
125-
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
125+
- {fileID: 2100000, guid: 474f0e0481d4aa14e92a5ada98042f3a, type: 2}
126126
m_SubsetIndices:
127127
m_StaticBatchRoot: {fileID: 0}
128128
m_ProbeAnchor: {fileID: 0}
@@ -166,10 +166,10 @@ Transform:
166166
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
167167
m_LocalPosition: {x: 0, y: 0, z: 5}
168168
m_LocalScale: {x: 1, y: 1, z: 1}
169+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
169170
m_Children: []
170171
m_Father: {fileID: 0}
171172
m_RootOrder: 2
172-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
173173
--- !u!114 &387044614
174174
MonoBehaviour:
175175
m_ObjectHideFlags: 0
@@ -189,9 +189,7 @@ MonoBehaviour:
189189
m_LOD: 2
190190
m_NumUpdatesBeforeRemoval: 10
191191
m_SecondsBetweenUpdates: 2.5
192-
m_Layer:
193-
serializedVersion: 2
194-
m_Bits: 1
192+
m_Layer: 0
195193
m_Material: {fileID: 0}
196194
m_EnableCollisions: 1
197195
--- !u!1 &428511244
@@ -227,6 +225,7 @@ Light:
227225
m_Shadows:
228226
m_Type: 2
229227
m_Resolution: -1
228+
m_CustomResolution: -1
230229
m_Strength: 1
231230
m_Bias: 0.05
232231
m_NormalBias: 0.4
@@ -252,10 +251,10 @@ Transform:
252251
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
253252
m_LocalPosition: {x: 0, y: 3, z: 0}
254253
m_LocalScale: {x: 1, y: 1, z: 1}
254+
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
255255
m_Children: []
256256
m_Father: {fileID: 0}
257257
m_RootOrder: 1
258-
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
259258
--- !u!1 &1783506190
260259
GameObject:
261260
m_ObjectHideFlags: 0
@@ -319,9 +318,7 @@ MonoBehaviour:
319318
m_LOD: 2
320319
m_NumUpdatesBeforeRemoval: 10
321320
m_SecondsBetweenUpdates: 2.5
322-
m_Layer:
323-
serializedVersion: 2
324-
m_Bits: 1
321+
m_Layer: 0
325322
m_Material: {fileID: 0}
326323
m_EnableCollisions: 1
327324
--- !u!81 &1783506193
@@ -388,10 +385,10 @@ Transform:
388385
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
389386
m_LocalPosition: {x: 0, y: 0, z: 0}
390387
m_LocalScale: {x: 1, y: 1, z: 1}
388+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
391389
m_Children: []
392390
m_Father: {fileID: 0}
393391
m_RootOrder: 0
394-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
395392
--- !u!114 &1783506198
396393
MonoBehaviour:
397394
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)