Skip to content

Commit 9621521

Browse files
jbienzmsjbienzms
authored
Merge pull request #8 from jbienzms/feature/Alignment
Feature/alignment
2 parents d351457 + e8f1a40 commit 9621521

File tree

65 files changed

+429022
-1711
lines changed

Some content is hidden

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

65 files changed

+429022
-1711
lines changed

‎.gitignore‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,5 +298,4 @@ FakesAssemblies/
298298
*.opt
299299
mixedreality-azure-samples.sln
300300
mixedreality-azure-samples.csproj
301-
mixedreality-azure-samples.Player.csproj
302-
SpatialAlignment-Unity/Assets/SpatialAlignment-Examples/Common/Models/Building/
301+
mixedreality-azure-samples.Player.csproj

‎SpatialAlignment-Unity/Assembly-CSharp-Editor.csproj‎

Lines changed: 213 additions & 207 deletions
Large diffs are not rendered by default.

‎SpatialAlignment-Unity/Assembly-CSharp.csproj‎

Lines changed: 198 additions & 188 deletions
Large diffs are not rendered by default.

‎SpatialAlignment-Unity/Assets/SpatialAlignment-Examples/Common/Materials/TestFace01.mat‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
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_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: TestFace01
11+
m_Shader: {fileID: 4800000, guid: d45c0efca53019e43891b0f610f8146e, type: 3}
12+
m_ShaderKeywords: _BORDER_LIGHT_USES_HOVER_COLOR _DIRECTIONAL_LIGHT _DISABLE_ALBEDO_MAP
13+
_HOVER_LIGHT _SPECULAR_HIGHLIGHTS
14+
m_LightmapFlags: 4
15+
m_EnableInstancingVariants: 0
16+
m_DoubleSidedGI: 0
17+
m_CustomRenderQueue: -1
18+
stringTagMap: {}
19+
disabledShaderPasses: []
20+
m_SavedProperties:
21+
serializedVersion: 3
22+
m_TexEnvs:
23+
- _MainTex:
24+
m_Texture: {fileID: 0}
25+
m_Scale: {x: 1, y: 1}
26+
m_Offset: {x: 0, y: 0}
27+
- _NormalMap:
28+
m_Texture: {fileID: 0}
29+
m_Scale: {x: 1, y: 1}
30+
m_Offset: {x: 0, y: 0}
31+
m_Floats:
32+
- _AlbedoAlphaMode: 0
33+
- _BlendOp: 0
34+
- _BorderLight: 0
35+
- _BorderLightOpaque: 0
36+
- _BorderLightUsesHoverColor: 1
37+
- _BorderMinValue: 0.1
38+
- _BorderWidth: 0.1
39+
- _ClippingPlane: 0
40+
- _ClippingPlaneBorder: 0
41+
- _ClippingPlaneBorderWidth: 0.025
42+
- _ColorWriteMask: 15
43+
- _CullMode: 2
44+
- _CustomMode: 0
45+
- _Cutoff: 0.5
46+
- _DirectionalLight: 1
47+
- _DstBlend: 0
48+
- _EdgeSmoothingValue: 0.002
49+
- _EnableEmission: 0
50+
- _EnableHoverColorOpaqueOverride: 0
51+
- _EnableHoverColorOverride: 0
52+
- _EnableNormalMap: 0
53+
- _EnvironmentColorIntensity: 0.5
54+
- _EnvironmentColorThreshold: 1.5
55+
- _EnvironmentColoring: 0
56+
- _FadeBeginDistance: 0.85
57+
- _FadeCompleteDistance: 0.5
58+
- _HoverLight: 1
59+
- _HoverLightOpaque: 0
60+
- _InnerGlow: 0
61+
- _Metallic: 0
62+
- _Mode: 0
63+
- _NearPlaneFade: 0
64+
- _Reflections: 0
65+
- _Refraction: 0
66+
- _RefractiveIndex: 0
67+
- _RenderQueueOverride: -1
68+
- _RimLight: 0
69+
- _RimPower: 0.25
70+
- _RoundCornerMargin: 0.01
71+
- _RoundCornerRadius: 0.25
72+
- _RoundCorners: 0
73+
- _Smoothness: 0.5
74+
- _SpecularHighlights: 1
75+
- _SrcBlend: 1
76+
- _ZTest: 4
77+
- _ZWrite: 1
78+
m_Colors:
79+
- _ClipPlane: {r: 0, g: 1, b: 0, a: 0}
80+
- _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
81+
- _Color: {r: 1, g: 0, b: 0, a: 1}
82+
- _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
83+
- _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
84+
- _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
85+
- _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
86+
- _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1}
87+
- _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
88+
- _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
89+
- _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}

‎SpatialAlignment-Unity/Assets/SpatialAlignment-Examples/Common/Materials/TestFace01.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.

‎SpatialAlignment-Unity/Assets/SpatialAlignment-Examples/Common/Materials/TestFace02.mat‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
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_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: TestFace02
11+
m_Shader: {fileID: 4800000, guid: d45c0efca53019e43891b0f610f8146e, type: 3}
12+
m_ShaderKeywords: _BORDER_LIGHT_USES_HOVER_COLOR _DIRECTIONAL_LIGHT _DISABLE_ALBEDO_MAP
13+
_HOVER_LIGHT _SPECULAR_HIGHLIGHTS
14+
m_LightmapFlags: 4
15+
m_EnableInstancingVariants: 0
16+
m_DoubleSidedGI: 0
17+
m_CustomRenderQueue: 2000
18+
stringTagMap:
19+
RenderType: Opaque
20+
disabledShaderPasses: []
21+
m_SavedProperties:
22+
serializedVersion: 3
23+
m_TexEnvs:
24+
- _MainTex:
25+
m_Texture: {fileID: 0}
26+
m_Scale: {x: 1, y: 1}
27+
m_Offset: {x: 0, y: 0}
28+
- _NormalMap:
29+
m_Texture: {fileID: 0}
30+
m_Scale: {x: 1, y: 1}
31+
m_Offset: {x: 0, y: 0}
32+
m_Floats:
33+
- _AlbedoAlphaMode: 0
34+
- _BlendOp: 0
35+
- _BorderLight: 0
36+
- _BorderLightOpaque: 0
37+
- _BorderLightUsesHoverColor: 1
38+
- _BorderMinValue: 0.1
39+
- _BorderWidth: 0.1
40+
- _ClippingPlane: 0
41+
- _ClippingPlaneBorder: 0
42+
- _ClippingPlaneBorderWidth: 0.025
43+
- _ColorWriteMask: 15
44+
- _CullMode: 2
45+
- _CustomMode: 0
46+
- _Cutoff: 0.5
47+
- _DirectionalLight: 1
48+
- _DstBlend: 0
49+
- _EdgeSmoothingValue: 0.002
50+
- _EnableEmission: 0
51+
- _EnableHoverColorOpaqueOverride: 0
52+
- _EnableHoverColorOverride: 0
53+
- _EnableNormalMap: 0
54+
- _EnvironmentColorIntensity: 0.5
55+
- _EnvironmentColorThreshold: 1.5
56+
- _EnvironmentColoring: 0
57+
- _FadeBeginDistance: 0.85
58+
- _FadeCompleteDistance: 0.5
59+
- _HoverLight: 1
60+
- _HoverLightOpaque: 0
61+
- _InnerGlow: 0
62+
- _Metallic: 0
63+
- _Mode: 0
64+
- _NearPlaneFade: 0
65+
- _Reflections: 0
66+
- _Refraction: 0
67+
- _RefractiveIndex: 0
68+
- _RenderQueueOverride: -1
69+
- _RimLight: 0
70+
- _RimPower: 0.25
71+
- _RoundCornerMargin: 0.01
72+
- _RoundCornerRadius: 0.25
73+
- _RoundCorners: 0
74+
- _Smoothness: 0.5
75+
- _SpecularHighlights: 1
76+
- _SrcBlend: 1
77+
- _ZTest: 4
78+
- _ZWrite: 1
79+
m_Colors:
80+
- _ClipPlane: {r: 0, g: 1, b: 0, a: 0}
81+
- _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
82+
- _Color: {r: 0, g: 1, b: 0, a: 1}
83+
- _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
84+
- _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
85+
- _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
86+
- _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
87+
- _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1}
88+
- _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
89+
- _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
90+
- _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}

‎SpatialAlignment-Unity/Assets/SpatialAlignment-Examples/Common/Materials/TestFace02.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.

‎SpatialAlignment-Unity/Assets/SpatialAlignment-Examples/Common/Materials/TestFace03.mat‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
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_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: TestFace03
11+
m_Shader: {fileID: 4800000, guid: d45c0efca53019e43891b0f610f8146e, type: 3}
12+
m_ShaderKeywords: _BORDER_LIGHT_USES_HOVER_COLOR _DIRECTIONAL_LIGHT _DISABLE_ALBEDO_MAP
13+
_HOVER_LIGHT _SPECULAR_HIGHLIGHTS
14+
m_LightmapFlags: 4
15+
m_EnableInstancingVariants: 0
16+
m_DoubleSidedGI: 0
17+
m_CustomRenderQueue: 2000
18+
stringTagMap:
19+
RenderType: Opaque
20+
disabledShaderPasses: []
21+
m_SavedProperties:
22+
serializedVersion: 3
23+
m_TexEnvs:
24+
- _MainTex:
25+
m_Texture: {fileID: 0}
26+
m_Scale: {x: 1, y: 1}
27+
m_Offset: {x: 0, y: 0}
28+
- _NormalMap:
29+
m_Texture: {fileID: 0}
30+
m_Scale: {x: 1, y: 1}
31+
m_Offset: {x: 0, y: 0}
32+
m_Floats:
33+
- _AlbedoAlphaMode: 0
34+
- _BlendOp: 0
35+
- _BorderLight: 0
36+
- _BorderLightOpaque: 0
37+
- _BorderLightUsesHoverColor: 1
38+
- _BorderMinValue: 0.1
39+
- _BorderWidth: 0.1
40+
- _ClippingPlane: 0
41+
- _ClippingPlaneBorder: 0
42+
- _ClippingPlaneBorderWidth: 0.025
43+
- _ColorWriteMask: 15
44+
- _CullMode: 2
45+
- _CustomMode: 0
46+
- _Cutoff: 0.5
47+
- _DirectionalLight: 1
48+
- _DstBlend: 0
49+
- _EdgeSmoothingValue: 0.002
50+
- _EnableEmission: 0
51+
- _EnableHoverColorOpaqueOverride: 0
52+
- _EnableHoverColorOverride: 0
53+
- _EnableNormalMap: 0
54+
- _EnvironmentColorIntensity: 0.5
55+
- _EnvironmentColorThreshold: 1.5
56+
- _EnvironmentColoring: 0
57+
- _FadeBeginDistance: 0.85
58+
- _FadeCompleteDistance: 0.5
59+
- _HoverLight: 1
60+
- _HoverLightOpaque: 0
61+
- _InnerGlow: 0
62+
- _Metallic: 0
63+
- _Mode: 0
64+
- _NearPlaneFade: 0
65+
- _Reflections: 0
66+
- _Refraction: 0
67+
- _RefractiveIndex: 0
68+
- _RenderQueueOverride: -1
69+
- _RimLight: 0
70+
- _RimPower: 0.25
71+
- _RoundCornerMargin: 0.01
72+
- _RoundCornerRadius: 0.25
73+
- _RoundCorners: 0
74+
- _Smoothness: 0.5
75+
- _SpecularHighlights: 1
76+
- _SrcBlend: 1
77+
- _ZTest: 4
78+
- _ZWrite: 1
79+
m_Colors:
80+
- _ClipPlane: {r: 0, g: 1, b: 0, a: 0}
81+
- _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
82+
- _Color: {r: 0, g: 0, b: 1, a: 1}
83+
- _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
84+
- _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
85+
- _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
86+
- _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
87+
- _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1}
88+
- _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
89+
- _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
90+
- _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}

‎SpatialAlignment-Unity/Assets/SpatialAlignment-Examples/Common/Materials/TestFace03.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.

‎SpatialAlignment-Unity/Assets/SpatialAlignment-Examples/Common/Materials/TestFace04.mat‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
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_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: TestFace04
11+
m_Shader: {fileID: 4800000, guid: d45c0efca53019e43891b0f610f8146e, type: 3}
12+
m_ShaderKeywords: _BORDER_LIGHT_USES_HOVER_COLOR _DIRECTIONAL_LIGHT _DISABLE_ALBEDO_MAP
13+
_HOVER_LIGHT _SPECULAR_HIGHLIGHTS
14+
m_LightmapFlags: 4
15+
m_EnableInstancingVariants: 0
16+
m_DoubleSidedGI: 0
17+
m_CustomRenderQueue: 2000
18+
stringTagMap:
19+
RenderType: Opaque
20+
disabledShaderPasses: []
21+
m_SavedProperties:
22+
serializedVersion: 3
23+
m_TexEnvs:
24+
- _MainTex:
25+
m_Texture: {fileID: 0}
26+
m_Scale: {x: 1, y: 1}
27+
m_Offset: {x: 0, y: 0}
28+
- _NormalMap:
29+
m_Texture: {fileID: 0}
30+
m_Scale: {x: 1, y: 1}
31+
m_Offset: {x: 0, y: 0}
32+
m_Floats:
33+
- _AlbedoAlphaMode: 0
34+
- _BlendOp: 0
35+
- _BorderLight: 0
36+
- _BorderLightOpaque: 0
37+
- _BorderLightUsesHoverColor: 1
38+
- _BorderMinValue: 0.1
39+
- _BorderWidth: 0.1
40+
- _ClippingPlane: 0
41+
- _ClippingPlaneBorder: 0
42+
- _ClippingPlaneBorderWidth: 0.025
43+
- _ColorWriteMask: 15
44+
- _CullMode: 2
45+
- _CustomMode: 0
46+
- _Cutoff: 0.5
47+
- _DirectionalLight: 1
48+
- _DstBlend: 0
49+
- _EdgeSmoothingValue: 0.002
50+
- _EnableEmission: 0
51+
- _EnableHoverColorOpaqueOverride: 0
52+
- _EnableHoverColorOverride: 0
53+
- _EnableNormalMap: 0
54+
- _EnvironmentColorIntensity: 0.5
55+
- _EnvironmentColorThreshold: 1.5
56+
- _EnvironmentColoring: 0
57+
- _FadeBeginDistance: 0.85
58+
- _FadeCompleteDistance: 0.5
59+
- _HoverLight: 1
60+
- _HoverLightOpaque: 0
61+
- _InnerGlow: 0
62+
- _Metallic: 0
63+
- _Mode: 0
64+
- _NearPlaneFade: 0
65+
- _Reflections: 0
66+
- _Refraction: 0
67+
- _RefractiveIndex: 0
68+
- _RenderQueueOverride: -1
69+
- _RimLight: 0
70+
- _RimPower: 0.25
71+
- _RoundCornerMargin: 0.01
72+
- _RoundCornerRadius: 0.25
73+
- _RoundCorners: 0
74+
- _Smoothness: 0.5
75+
- _SpecularHighlights: 1
76+
- _SrcBlend: 1
77+
- _ZTest: 4
78+
- _ZWrite: 1
79+
m_Colors:
80+
- _ClipPlane: {r: 0, g: 1, b: 0, a: 0}
81+
- _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
82+
- _Color: {r: 1, g: 1, b: 0, a: 1}
83+
- _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
84+
- _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
85+
- _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
86+
- _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
87+
- _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1}
88+
- _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
89+
- _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
90+
- _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}

0 commit comments

Comments
 (0)