Skip to content

Commit 162958a

Browse files
committed
v1.0.3 MRTKv2 support.
Hololens 10.0.17763.914 (RS5) Windows 10 SDK 10.0.18362.0 Visual Studio 2017 or 2019 Unity 2018.4+ Microsoft Mixed Reality Toolkit v2.2.0 OpenCVForUnity 2.3.7+ DlibFaceLandmarkDetector 1.2.9+ HoloLensCameraStream
1 parent 1aa4b8b commit 162958a

31 files changed

+3500
-2803
lines changed

Assets/HoloLensWithDlibFaceLandmarkDetectorExample/HoloLensARHeadExample/AR/Materials/axes_x_material.mat

Lines changed: 132 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -4,125 +4,169 @@
44
Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
7-
m_PrefabParentObject: {fileID: 0}
8-
m_PrefabInternal: {fileID: 0}
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
910
m_Name: axes_x_material
10-
m_Shader: {fileID: 4800000, guid: 30a212a88e1063a428c85e50b1e427f2, type: 3}
11-
m_ShaderKeywords: _ALPHABLEND_ON _EMISSION _GLOSSYREFLECTIONS_OFF _SPECULARHIGHLIGHTS_OFF
11+
m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
12+
m_ShaderKeywords: _DIRECTIONAL_LIGHT _DISABLE_ALBEDO_MAP _GLOSSYREFLECTIONS_OFF
13+
_HOVER_LIGHT _PROXIMITY_LIGHT _SPECULARHIGHLIGHTS_OFF _SPECULAR_HIGHLIGHTS
1214
m_LightmapFlags: 1
13-
m_CustomRenderQueue: 3000
15+
m_EnableInstancingVariants: 0
16+
m_DoubleSidedGI: 0
17+
m_CustomRenderQueue: 2000
1418
stringTagMap:
15-
RenderType: Transparent
19+
RenderType: Opaque
20+
disabledShaderPasses: []
1621
m_SavedProperties:
17-
serializedVersion: 2
22+
serializedVersion: 3
1823
m_TexEnvs:
19-
- first:
20-
name: _BumpMap
21-
second:
24+
- _BumpMap:
2225
m_Texture: {fileID: 0}
2326
m_Scale: {x: 1, y: 1}
2427
m_Offset: {x: 0, y: 0}
25-
- first:
26-
name: _DetailAlbedoMap
27-
second:
28+
- _ChannelMap:
2829
m_Texture: {fileID: 0}
2930
m_Scale: {x: 1, y: 1}
3031
m_Offset: {x: 0, y: 0}
31-
- first:
32-
name: _DetailMask
33-
second:
32+
- _DetailAlbedoMap:
3433
m_Texture: {fileID: 0}
3534
m_Scale: {x: 1, y: 1}
3635
m_Offset: {x: 0, y: 0}
37-
- first:
38-
name: _DetailNormalMap
39-
second:
36+
- _DetailMask:
4037
m_Texture: {fileID: 0}
4138
m_Scale: {x: 1, y: 1}
4239
m_Offset: {x: 0, y: 0}
43-
- first:
44-
name: _EmissionMap
45-
second:
40+
- _DetailNormalMap:
4641
m_Texture: {fileID: 0}
4742
m_Scale: {x: 1, y: 1}
4843
m_Offset: {x: 0, y: 0}
49-
- first:
50-
name: _MainTex
51-
second:
44+
- _EmissionMap:
5245
m_Texture: {fileID: 0}
5346
m_Scale: {x: 1, y: 1}
5447
m_Offset: {x: 0, y: 0}
55-
- first:
56-
name: _MetallicGlossMap
57-
second:
48+
- _IridescentSpectrumMap:
5849
m_Texture: {fileID: 0}
5950
m_Scale: {x: 1, y: 1}
6051
m_Offset: {x: 0, y: 0}
61-
- first:
62-
name: _OcclusionMap
63-
second:
52+
- _MainTex:
6453
m_Texture: {fileID: 0}
6554
m_Scale: {x: 1, y: 1}
6655
m_Offset: {x: 0, y: 0}
67-
- first:
68-
name: _ParallaxMap
69-
second:
56+
- _MetallicGlossMap:
57+
m_Texture: {fileID: 0}
58+
m_Scale: {x: 1, y: 1}
59+
m_Offset: {x: 0, y: 0}
60+
- _NormalMap:
61+
m_Texture: {fileID: 0}
62+
m_Scale: {x: 1, y: 1}
63+
m_Offset: {x: 0, y: 0}
64+
- _OcclusionMap:
65+
m_Texture: {fileID: 0}
66+
m_Scale: {x: 1, y: 1}
67+
m_Offset: {x: 0, y: 0}
68+
- _ParallaxMap:
7069
m_Texture: {fileID: 0}
7170
m_Scale: {x: 1, y: 1}
7271
m_Offset: {x: 0, y: 0}
7372
m_Floats:
74-
- first:
75-
name: _BumpScale
76-
second: 1
77-
- first:
78-
name: _Cutoff
79-
second: 0.5
80-
- first:
81-
name: _DetailNormalMapScale
82-
second: 1
83-
- first:
84-
name: _DstBlend
85-
second: 10
86-
- first:
87-
name: _GlossMapScale
88-
second: 1
89-
- first:
90-
name: _Glossiness
91-
second: 0
92-
- first:
93-
name: _GlossyReflections
94-
second: 0
95-
- first:
96-
name: _Metallic
97-
second: 0
98-
- first:
99-
name: _Mode
100-
second: 2
101-
- first:
102-
name: _OcclusionStrength
103-
second: 1
104-
- first:
105-
name: _Parallax
106-
second: 0.02
107-
- first:
108-
name: _SmoothnessTextureChannel
109-
second: 0
110-
- first:
111-
name: _SpecularHighlights
112-
second: 0
113-
- first:
114-
name: _SrcBlend
115-
second: 5
116-
- first:
117-
name: _UVSec
118-
second: 0
119-
- first:
120-
name: _ZWrite
121-
second: 0
73+
- _AlbedoAlphaMode: 0
74+
- _AlbedoAssignedAtRuntime: 0
75+
- _BlendOp: 0
76+
- _BlendedClippingWidth: 1
77+
- _BorderLight: 0
78+
- _BorderLightOpaque: 0
79+
- _BorderLightOpaqueAlpha: 1
80+
- _BorderLightReplacesAlbedo: 0
81+
- _BorderLightUsesHoverColor: 0
82+
- _BorderMinValue: 0.1
83+
- _BorderWidth: 0.1
84+
- _BumpScale: 1
85+
- _ClippingBorder: 0
86+
- _ClippingBorderWidth: 0.025
87+
- _ColorWriteMask: 15
88+
- _CullMode: 2
89+
- _CustomMode: 0
90+
- _Cutoff: 0.5
91+
- _DetailNormalMapScale: 1
92+
- _DirectionalLight: 1
93+
- _DstBlend: 0
94+
- _EdgeSmoothingValue: 0.002
95+
- _EnableChannelMap: 0
96+
- _EnableEmission: 0
97+
- _EnableHoverColorOverride: 0
98+
- _EnableLocalSpaceTriplanarMapping: 0
99+
- _EnableNormalMap: 0
100+
- _EnableProximityLightColorOverride: 0
101+
- _EnableTriplanarMapping: 0
102+
- _EnvironmentColorIntensity: 0.5
103+
- _EnvironmentColorThreshold: 1.5
104+
- _EnvironmentColoring: 0
105+
- _FadeBeginDistance: 0.85
106+
- _FadeCompleteDistance: 0.5
107+
- _FadeMinValue: 0
108+
- _FluentLightIntensity: 1
109+
- _GlossMapScale: 1
110+
- _Glossiness: 0
111+
- _GlossyReflections: 0
112+
- _HoverLight: 1
113+
- _IgnoreZScale: 0
114+
- _InnerGlow: 0
115+
- _InnerGlowPower: 4
116+
- _InstancedColor: 0
117+
- _Iridescence: 0
118+
- _IridescenceAngle: -0.78
119+
- _IridescenceIntensity: 0.5
120+
- _IridescenceThreshold: 0.05
121+
- _Metallic: 0
122+
- _Mode: 0
123+
- _NearLightFade: 0
124+
- _NearPlaneFade: 0
125+
- _NormalMapScale: 1
126+
- _OcclusionStrength: 1
127+
- _Parallax: 0.02
128+
- _ProximityLight: 1
129+
- _ProximityLightSubtractive: 0
130+
- _ProximityLightTwoSided: 0
131+
- _Reflections: 0
132+
- _Refraction: 0
133+
- _RefractiveIndex: 0
134+
- _RenderQueueOverride: -1
135+
- _RimLight: 0
136+
- _RimPower: 0.25
137+
- _RoundCornerMargin: 0.01
138+
- _RoundCornerRadius: 0.25
139+
- _RoundCorners: 0
140+
- _Smoothness: 0.5
141+
- _SmoothnessTextureChannel: 0
142+
- _SpecularHighlights: 1
143+
- _SphericalHarmonics: 0
144+
- _SrcBlend: 1
145+
- _Stencil: 0
146+
- _StencilComparison: 0
147+
- _StencilOperation: 0
148+
- _StencilReference: 0
149+
- _TriplanarMappingBlendSharpness: 4
150+
- _UVSec: 0
151+
- _VertexColors: 0
152+
- _VertexExtrusion: 0
153+
- _VertexExtrusionSmoothNormals: 0
154+
- _VertexExtrusionValue: 0
155+
- _ZOffsetFactor: 0
156+
- _ZOffsetUnits: 0
157+
- _ZTest: 4
158+
- _ZWrite: 1
122159
m_Colors:
123-
- first:
124-
name: _Color
125-
second: {r: 0, g: 0, b: 1, a: 1}
126-
- first:
127-
name: _EmissionColor
128-
second: {r: 0, g: 0, b: 0, a: 1}
160+
- _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
161+
- _Color: {r: 1, g: 0, b: 0, a: 1}
162+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
163+
- _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
164+
- _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
165+
- _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
166+
- _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
167+
- _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
168+
- _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
169+
- _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
170+
- _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
171+
- _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
172+
- _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}

0 commit comments

Comments
 (0)