Skip to content

Commit 79d0659

Browse files
committed
Revert Wireframe.mat to black & white. Adding WireframeBlue.mat. Updated scene with new material. Adding missing meta file for the readme.
1 parent aca52a9 commit 79d0659

File tree

5 files changed

+103
-2
lines changed

5 files changed

+103
-2
lines changed

Assets/HoloToolkit-Examples/SpatialMapping/Scenes/SpatialProcessingSurfaceMagnetism.unity

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -514,6 +514,11 @@ Prefab:
514514
propertyPath: m_RootOrder
515515
value: 4
516516
objectReference: {fileID: 0}
517+
- target: {fileID: 114000011154029958, guid: 2ed75ffdf9031c94e8bce4b3d17b9928,
518+
type: 2}
519+
propertyPath: surfaceMaterial
520+
value:
521+
objectReference: {fileID: 2100000, guid: 729453690df4d40488b01b78b3af849d, type: 2}
517522
m_RemovedComponents: []
518523
m_ParentPrefab: {fileID: 100100000, guid: 2ed75ffdf9031c94e8bce4b3d17b9928, type: 2}
519524
m_IsPrefabParent: 0

Assets/HoloToolkit-Examples/SpatialMapping/SpatialProcessingSurfaceMagnetism.md.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/SpatialMapping/Materials/Wireframe.mat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Material:
7373
- _WireThickness: 100
7474
- _ZWrite: 1
7575
m_Colors:
76-
- _BaseColor: {r: 0.0036224083, g: 0.24982113, b: 0.49264705, a: 1}
76+
- _BaseColor: {r: 0, g: 0, b: 0, a: 1}
7777
- _Color: {r: 1, g: 1, b: 1, a: 1}
7878
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
79-
- _WireColor: {r: 0, g: 0.66896534, b: 1, a: 1}
79+
- _WireColor: {r: 1, g: 1, b: 1, a: 1}
Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
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: WireframeBlue
10+
m_Shader: {fileID: 4800000, guid: 0d08dd59087697b44a68a02cc9a7c3a2, type: 3}
11+
m_ShaderKeywords: ETC1_EXTERNAL_ALPHA
12+
m_LightmapFlags: 5
13+
m_EnableInstancingVariants: 0
14+
m_DoubleSidedGI: 0
15+
m_CustomRenderQueue: 2000
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+
- _DetailAlbedoMap:
26+
m_Texture: {fileID: 0}
27+
m_Scale: {x: 1, y: 1}
28+
m_Offset: {x: 0, y: 0}
29+
- _DetailMask:
30+
m_Texture: {fileID: 0}
31+
m_Scale: {x: 1, y: 1}
32+
m_Offset: {x: 0, y: 0}
33+
- _DetailNormalMap:
34+
m_Texture: {fileID: 0}
35+
m_Scale: {x: 1, y: 1}
36+
m_Offset: {x: 0, y: 0}
37+
- _EmissionMap:
38+
m_Texture: {fileID: 0}
39+
m_Scale: {x: 1, y: 1}
40+
m_Offset: {x: 0, y: 0}
41+
- _MainTex:
42+
m_Texture: {fileID: 0}
43+
m_Scale: {x: 1, y: 1}
44+
m_Offset: {x: 0, y: 0}
45+
- _MetallicGlossMap:
46+
m_Texture: {fileID: 0}
47+
m_Scale: {x: 1, y: 1}
48+
m_Offset: {x: 0, y: 0}
49+
- _OcclusionMap:
50+
m_Texture: {fileID: 0}
51+
m_Scale: {x: 1, y: 1}
52+
m_Offset: {x: 0, y: 0}
53+
- _ParallaxMap:
54+
m_Texture: {fileID: 0}
55+
m_Scale: {x: 1, y: 1}
56+
m_Offset: {x: 0, y: 0}
57+
m_Floats:
58+
- _BumpScale: 1
59+
- _Cutoff: 0.5
60+
- _DetailNormalMapScale: 1
61+
- _DstBlend: 0
62+
- _GlossMapScale: 1
63+
- _Glossiness: 0.5
64+
- _GlossyReflections: 1
65+
- _Metallic: 0
66+
- _Mode: 0
67+
- _OcclusionStrength: 1
68+
- _Parallax: 0.02
69+
- _SmoothnessTextureChannel: 0
70+
- _SpecularHighlights: 1
71+
- _SrcBlend: 1
72+
- _UVSec: 0
73+
- _WireThickness: 434
74+
- _ZWrite: 1
75+
m_Colors:
76+
- _BaseColor: {r: 0.0036224083, g: 0.24982113, b: 0.49264705, a: 1}
77+
- _Color: {r: 1, g: 1, b: 1, a: 1}
78+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
79+
- _WireColor: {r: 0, g: 0.66896534, b: 1, a: 1}

Assets/HoloToolkit/SpatialMapping/Materials/WireframeBlue.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.

0 commit comments

Comments
 (0)