Skip to content

Commit 827b1e5

Browse files
bsawyer-mlbsawyer-ml
committed
Release v2.1.0
1 parent 55fca3c commit 827b1e5

File tree

66 files changed

+41797
-12119
lines changed

Some content is hidden

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

66 files changed

+41797
-12119
lines changed

‎Assets/MagicLeapInput.inputactions‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@
231231
{
232232
"name": "",
233233
"id": "c2b03674-dafa-444c-8620-3280c282adf9",
234-
"path": "<MagicLeapController>{RightHand}/pointerPosition",
234+
"path": "<MagicLeapController>{RightHand}/pointer/position",
235235
"interactions": "",
236236
"processors": "",
237237
"groups": "Magic Leap 2",
@@ -242,7 +242,7 @@
242242
{
243243
"name": "",
244244
"id": "807f91c0-0511-4b5a-8873-55fff6b2dd78",
245-
"path": "<MagicLeapController>{LeftHand}/pointerPosition",
245+
"path": "<MagicLeapController>{LeftHand}/pointer/position",
246246
"interactions": "",
247247
"processors": "",
248248
"groups": "Magic Leap 2",
@@ -253,7 +253,7 @@
253253
{
254254
"name": "",
255255
"id": "123b83cc-1670-4b3c-8f11-e5b34719c3e9",
256-
"path": "<MagicLeapController>{RightHand}/pointerRotation",
256+
"path": "<MagicLeapController>{RightHand}/pointer/rotation",
257257
"interactions": "",
258258
"processors": "",
259259
"groups": "Magic Leap 2",
@@ -264,7 +264,7 @@
264264
{
265265
"name": "",
266266
"id": "5d664175-4eb6-4001-80ea-caabb83d96c1",
267-
"path": "<MagicLeapController>{LeftHand}/pointerRotation",
267+
"path": "<MagicLeapController>{LeftHand}/pointer/rotation",
268268
"interactions": "",
269269
"processors": "",
270270
"groups": "Magic Leap 2",
@@ -851,7 +851,7 @@
851851
{
852852
"name": "",
853853
"id": "be90f058-beee-43fe-b998-87cf060e8920",
854-
"path": "<HandInteraction>{RightHand}/{PointerActivateReady}",
854+
"path": "<HandInteraction>{LeftHand}/{PointerActivateReady}",
855855
"interactions": "",
856856
"processors": "",
857857
"groups": "Magic Leap 2",

‎Assets/Materials/MeshMaterial.mat‎

Lines changed: 153 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,153 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 8
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: MeshMaterial
11+
m_Shader: {fileID: 210, guid: 0000000000000000f000000000000000, type: 0}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
14+
m_ValidKeywords:
15+
- _EMISSION
16+
m_InvalidKeywords:
17+
- _GLOSSYREFLECTIONS_OFF
18+
m_LightmapFlags: 0
19+
m_EnableInstancingVariants: 0
20+
m_DoubleSidedGI: 0
21+
m_CustomRenderQueue: -1
22+
stringTagMap: {}
23+
disabledShaderPasses:
24+
- GRABPASS
25+
m_LockedProperties:
26+
m_SavedProperties:
27+
serializedVersion: 3
28+
m_TexEnvs:
29+
- _BaseMap:
30+
m_Texture: {fileID: 0}
31+
m_Scale: {x: 1, y: 1}
32+
m_Offset: {x: 0, y: 0}
33+
- _BumpMap:
34+
m_Texture: {fileID: 0}
35+
m_Scale: {x: 1, y: 1}
36+
m_Offset: {x: 0, y: 0}
37+
- _DetailAlbedoMap:
38+
m_Texture: {fileID: 0}
39+
m_Scale: {x: 1, y: 1}
40+
m_Offset: {x: 0, y: 0}
41+
- _DetailMask:
42+
m_Texture: {fileID: 0}
43+
m_Scale: {x: 1, y: 1}
44+
m_Offset: {x: 0, y: 0}
45+
- _DetailNormalMap:
46+
m_Texture: {fileID: 0}
47+
m_Scale: {x: 1, y: 1}
48+
m_Offset: {x: 0, y: 0}
49+
- _EmissionMap:
50+
m_Texture: {fileID: 0}
51+
m_Scale: {x: 1, y: 1}
52+
m_Offset: {x: 0, y: 0}
53+
- _MainTex:
54+
m_Texture: {fileID: 0}
55+
m_Scale: {x: 1, y: 1}
56+
m_Offset: {x: 0, y: 0}
57+
- _MetallicGlossMap:
58+
m_Texture: {fileID: 0}
59+
m_Scale: {x: 1, y: 1}
60+
m_Offset: {x: 0, y: 0}
61+
- _OcclusionMap:
62+
m_Texture: {fileID: 0}
63+
m_Scale: {x: 1, y: 1}
64+
m_Offset: {x: 0, y: 0}
65+
- _ParallaxMap:
66+
m_Texture: {fileID: 0}
67+
m_Scale: {x: 1, y: 1}
68+
m_Offset: {x: 0, y: 0}
69+
- _SpecGlossMap:
70+
m_Texture: {fileID: 0}
71+
m_Scale: {x: 1, y: 1}
72+
m_Offset: {x: 0, y: 0}
73+
- unity_Lightmaps:
74+
m_Texture: {fileID: 0}
75+
m_Scale: {x: 1, y: 1}
76+
m_Offset: {x: 0, y: 0}
77+
- unity_LightmapsInd:
78+
m_Texture: {fileID: 0}
79+
m_Scale: {x: 1, y: 1}
80+
m_Offset: {x: 0, y: 0}
81+
- unity_ShadowMasks:
82+
m_Texture: {fileID: 0}
83+
m_Scale: {x: 1, y: 1}
84+
m_Offset: {x: 0, y: 0}
85+
m_Ints: []
86+
m_Floats:
87+
- _AlphaClip: 0
88+
- _AlphaToMask: 0
89+
- _Blend: 0
90+
- _BlendModePreserveSpecular: 1
91+
- _BlendOp: 0
92+
- _BumpScale: 1
93+
- _CameraFadingEnabled: 0
94+
- _CameraFarFadeDistance: 2
95+
- _CameraNearFadeDistance: 1
96+
- _ClearCoatMask: 0
97+
- _ClearCoatSmoothness: 0
98+
- _Cull: 2
99+
- _Cutoff: 0.5
100+
- _DetailAlbedoMapScale: 1
101+
- _DetailNormalMapScale: 1
102+
- _DistortionBlend: 0.5
103+
- _DistortionEnabled: 0
104+
- _DistortionStrength: 1
105+
- _DistortionStrengthScaled: 0
106+
- _DstBlend: 0
107+
- _DstBlendAlpha: 0
108+
- _EmissionEnabled: 1
109+
- _EnvironmentReflections: 1
110+
- _FlipbookMode: 0
111+
- _GlossMapScale: 0
112+
- _Glossiness: 0
113+
- _GlossyReflections: 0
114+
- _LightingEnabled: 1
115+
- _Metallic: 0
116+
- _Mode: 0
117+
- _OcclusionStrength: 1
118+
- _Parallax: 0.005
119+
- _QueueOffset: 0
120+
- _ReceiveShadows: 1
121+
- _Smoothness: 0.5
122+
- _SmoothnessTextureChannel: 0
123+
- _SoftParticlesEnabled: 0
124+
- _SoftParticlesFarFadeDistance: 1
125+
- _SoftParticlesNearFadeDistance: 0
126+
- _SpecularHighlights: 1
127+
- _SrcBlend: 1
128+
- _SrcBlendAlpha: 1
129+
- _Surface: 0
130+
- _UVSec: 0
131+
- _WorkflowMode: 1
132+
- _ZWrite: 1
133+
m_Colors:
134+
- _BaseColor: {r: 1, g: 0, b: 0, a: 1}
135+
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
136+
- _Color: {r: 0.25890982, g: 0.2915239, b: 1, a: 1}
137+
- _EmissionColor: {r: 0.6698113, g: 0.60943, b: 0.60943, a: 1}
138+
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
139+
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
140+
m_BuildTextureStacks: []
141+
--- !u!114 &4270725569988127078
142+
MonoBehaviour:
143+
m_ObjectHideFlags: 11
144+
m_CorrespondingSourceObject: {fileID: 0}
145+
m_PrefabInstance: {fileID: 0}
146+
m_PrefabAsset: {fileID: 0}
147+
m_GameObject: {fileID: 0}
148+
m_Enabled: 1
149+
m_EditorHideFlags: 0
150+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
151+
m_Name:
152+
m_EditorClassIdentifier:
153+
version: 7

‎Assets/Materials/MeshMaterial.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.

‎Assets/Materials/MeshingPointCloudMaterial.mat‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 8
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: MeshingPointCloudMaterial
11+
m_Shader: {fileID: 10721, guid: 0000000000000000f000000000000000, type: 0}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
14+
m_ValidKeywords: []
15+
m_InvalidKeywords: []
16+
m_LightmapFlags: 4
17+
m_EnableInstancingVariants: 0
18+
m_DoubleSidedGI: 0
19+
m_CustomRenderQueue: -1
20+
stringTagMap: {}
21+
disabledShaderPasses: []
22+
m_LockedProperties:
23+
m_SavedProperties:
24+
serializedVersion: 3
25+
m_TexEnvs:
26+
- _BumpMap:
27+
m_Texture: {fileID: 0}
28+
m_Scale: {x: 1, y: 1}
29+
m_Offset: {x: 0, y: 0}
30+
- _DetailAlbedoMap:
31+
m_Texture: {fileID: 0}
32+
m_Scale: {x: 1, y: 1}
33+
m_Offset: {x: 0, y: 0}
34+
- _DetailMask:
35+
m_Texture: {fileID: 0}
36+
m_Scale: {x: 1, y: 1}
37+
m_Offset: {x: 0, y: 0}
38+
- _DetailNormalMap:
39+
m_Texture: {fileID: 0}
40+
m_Scale: {x: 1, y: 1}
41+
m_Offset: {x: 0, y: 0}
42+
- _EmissionMap:
43+
m_Texture: {fileID: 0}
44+
m_Scale: {x: 1, y: 1}
45+
m_Offset: {x: 0, y: 0}
46+
- _MainTex:
47+
m_Texture: {fileID: 2800000, guid: d458976bb8f5d9643b22baba5aa24276, type: 3}
48+
m_Scale: {x: 1, y: 1}
49+
m_Offset: {x: 0, y: 0}
50+
- _MetallicGlossMap:
51+
m_Texture: {fileID: 0}
52+
m_Scale: {x: 1, y: 1}
53+
m_Offset: {x: 0, y: 0}
54+
- _OcclusionMap:
55+
m_Texture: {fileID: 0}
56+
m_Scale: {x: 1, y: 1}
57+
m_Offset: {x: 0, y: 0}
58+
- _ParallaxMap:
59+
m_Texture: {fileID: 0}
60+
m_Scale: {x: 1, y: 1}
61+
m_Offset: {x: 0, y: 0}
62+
m_Ints: []
63+
m_Floats:
64+
- _BumpScale: 1
65+
- _Cutoff: 0.5
66+
- _DetailNormalMapScale: 1
67+
- _DstBlend: 0
68+
- _GlossMapScale: 1
69+
- _Glossiness: 0.5
70+
- _GlossyReflections: 1
71+
- _Metallic: 0
72+
- _Mode: 0
73+
- _OcclusionStrength: 1
74+
- _Parallax: 0.02
75+
- _SmoothnessTextureChannel: 0
76+
- _SpecularHighlights: 1
77+
- _SrcBlend: 1
78+
- _UVSec: 0
79+
- _ZWrite: 1
80+
m_Colors:
81+
- _Color: {r: 1, g: 1, b: 1, a: 1}
82+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
83+
m_BuildTextureStacks: []

‎Assets/Materials/MeshingPointCloudMaterial.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.

‎Assets/Materials/DebugPlane.mat‎ renamed to ‎Assets/Materials/Plane.mat‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ Material:
2020
m_CorrespondingSourceObject: {fileID: 0}
2121
m_PrefabInstance: {fileID: 0}
2222
m_PrefabAsset: {fileID: 0}
23-
m_Name: DebugPlane
24-
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
23+
m_Name: Plane
24+
m_Shader: {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
2525
m_Parent: {fileID: 0}
2626
m_ModifiedSerializedProperties: 0
27-
m_ValidKeywords:
27+
m_ValidKeywords: []
28+
m_InvalidKeywords:
2829
- _GLOSSYREFLECTIONS_OFF
29-
m_InvalidKeywords: []
3030
m_LightmapFlags: 4
3131
m_EnableInstancingVariants: 0
3232
m_DoubleSidedGI: 0
@@ -102,6 +102,7 @@ Material:
102102
- _BumpScale: 1
103103
- _ClearCoatMask: 0
104104
- _ClearCoatSmoothness: 0
105+
- _ColorMask: 15
105106
- _Cull: 2
106107
- _Cutoff: 0.5
107108
- _DetailAlbedoMapScale: 1
@@ -123,8 +124,14 @@ Material:
123124
- _SpecularHighlights: 1
124125
- _SrcBlend: 1
125126
- _SrcBlendAlpha: 1
127+
- _Stencil: 0
128+
- _StencilComp: 8
129+
- _StencilOp: 0
130+
- _StencilReadMask: 255
131+
- _StencilWriteMask: 255
126132
- _Surface: 0
127133
- _UVSec: 0
134+
- _UseUIAlphaClip: 0
128135
- _WorkflowMode: 1
129136
- _ZWrite: 1
130137
m_Colors:

‎Assets/Materials/DebugPlane.mat.meta‎ renamed to ‎Assets/Materials/Plane.mat.meta‎

File renamed without changes.

0 commit comments

Comments
 (0)