Skip to content

Commit b8bb4d8

Browse files
EcnassianerEcnassianer
authored
Merge pull request #3 from Microsoft/mrtk_development
updating to most recent microsoft fork
2 parents b811b37 + 60e6a6f commit b8bb4d8

File tree

602 files changed

+22191
-5655
lines changed

Some content is hidden

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

602 files changed

+22191
-5655
lines changed

‎.gitignore‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,16 @@ obj/
4141
*.idb
4242
*.opendb
4343

44-
Assets/ThirdParty/
45-
Assets/ThirdParty.meta
44+
# ============================ #
45+
# Visual Studio Code Generated #
46+
# ============================ #
47+
.vscode/
4648

49+
# ===================== #
50+
# Project Specific List #
51+
# ===================== #
4752
artifacts/
53+
Assets/ThirdParty/
54+
Assets/ThirdParty.meta
4855
Assets/TextMesh Pro.meta
4956
Assets/TextMesh Pro/

‎Assets/MixedRealityToolkit-Examples/Demos/Boundary/Scenes/BoundaryVisualization.unity‎

Lines changed: 249 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,84 @@ NavMeshSettings:
113113
debug:
114114
m_Flags: 0
115115
m_NavMeshData: {fileID: 0}
116+
--- !u!1 &263188393
117+
GameObject:
118+
m_ObjectHideFlags: 0
119+
m_PrefabParentObject: {fileID: 1054075472835142, guid: a900c08743a94c328074df8bbe3eb63c,
120+
type: 2}
121+
m_PrefabInternal: {fileID: 0}
122+
serializedVersion: 5
123+
m_Component:
124+
- component: {fileID: 263188394}
125+
- component: {fileID: 263188396}
126+
- component: {fileID: 263188395}
127+
m_Layer: 5
128+
m_Name: Subtitle4
129+
m_TagString: Untagged
130+
m_Icon: {fileID: 0}
131+
m_NavMeshLayer: 0
132+
m_StaticEditorFlags: 0
133+
m_IsActive: 1
134+
--- !u!224 &263188394
135+
RectTransform:
136+
m_ObjectHideFlags: 0
137+
m_PrefabParentObject: {fileID: 224963507392718102, guid: a900c08743a94c328074df8bbe3eb63c,
138+
type: 2}
139+
m_PrefabInternal: {fileID: 0}
140+
m_GameObject: {fileID: 263188393}
141+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
142+
m_LocalPosition: {x: 0, y: 0, z: -0.019088056}
143+
m_LocalScale: {x: 0.00049999997, y: 0.00049999997, z: 0.00049999997}
144+
m_Children: []
145+
m_Father: {fileID: 1323674719}
146+
m_RootOrder: 9
147+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
148+
m_AnchorMin: {x: 0.5, y: 0.5}
149+
m_AnchorMax: {x: 0.5, y: 0.5}
150+
m_AnchoredPosition: {x: -0.0001001358, y: -0.0072}
151+
m_SizeDelta: {x: 1107.8, y: 89.1924}
152+
m_Pivot: {x: 0.5, y: 0.5}
153+
--- !u!114 &263188395
154+
MonoBehaviour:
155+
m_ObjectHideFlags: 0
156+
m_PrefabParentObject: {fileID: 114186135864427680, guid: a900c08743a94c328074df8bbe3eb63c,
157+
type: 2}
158+
m_PrefabInternal: {fileID: 0}
159+
m_GameObject: {fileID: 263188393}
160+
m_Enabled: 1
161+
m_EditorHideFlags: 0
162+
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
163+
m_Name:
164+
m_EditorClassIdentifier:
165+
m_Material: {fileID: 0}
166+
m_Color: {r: 1, g: 1, b: 1, a: 1}
167+
m_RaycastTarget: 1
168+
m_OnCullStateChanged:
169+
m_PersistentCalls:
170+
m_Calls: []
171+
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
172+
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
173+
m_FontData:
174+
m_Font: {fileID: 12800000, guid: e869342c56e54acf989b2422b4b80dcc, type: 3}
175+
m_FontSize: 40
176+
m_FontStyle: 0
177+
m_BestFit: 0
178+
m_MinSize: 4
179+
m_MaxSize: 101
180+
m_Alignment: 0
181+
m_AlignByGeometry: 0
182+
m_RichText: 1
183+
m_HorizontalOverflow: 0
184+
m_VerticalOverflow: 0
185+
m_LineSpacing: 1
186+
m_Text: ' Show Tracked Area'
187+
--- !u!222 &263188396
188+
CanvasRenderer:
189+
m_ObjectHideFlags: 0
190+
m_PrefabParentObject: {fileID: 222823303811744904, guid: a900c08743a94c328074df8bbe3eb63c,
191+
type: 2}
192+
m_PrefabInternal: {fileID: 0}
193+
m_GameObject: {fileID: 263188393}
116194
--- !u!1001 &310729792
117195
Prefab:
118196
m_ObjectHideFlags: 0
@@ -168,8 +246,11 @@ Prefab:
168246
playspace inscribed within those bounds.\n\n\nContols the visualization of
169247
the user's configured boundary, including spheres that indicate the shape
170248
of the space.\n\n\n Instructs the Boundary System to show or hide the
171-
floor.\n\n\n\n Instructs the Boundary System to show or hide a rectanglular
172-
representation of the user's Play Area."
249+
floor.\n\n\n Instructs the Boundary System to show or hide a rectanglular
250+
representation of the user's Play Area.\n\n\n Instructs the Boundary System
251+
to show or hide the outline of the boundary geometry.\n\n\n Instructs
252+
the Boundary System to show or hide boundary walls.\n\n\n Instructs the
253+
Boundary System to show or hide the upper limit of the boundary."
173254
objectReference: {fileID: 0}
174255
- target: {fileID: 114713125240876806, guid: a900c08743a94c328074df8bbe3eb63c,
175256
type: 2}
@@ -206,7 +287,7 @@ Prefab:
206287
- target: {fileID: 224963507392718102, guid: a900c08743a94c328074df8bbe3eb63c,
207288
type: 2}
208289
propertyPath: m_AnchoredPosition.y
209-
value: 0.056
290+
value: 0.0742
210291
objectReference: {fileID: 0}
211292
- target: {fileID: 1054075472835142, guid: a900c08743a94c328074df8bbe3eb63c, type: 2}
212293
propertyPath: m_IsActive
@@ -361,6 +442,87 @@ MonoBehaviour:
361442
m_EditorClassIdentifier:
362443
showFloor: 1
363444
showPlayArea: 1
445+
showTrackedArea: 1
446+
showBoundaryWalls: 1
447+
showBoundaryCeiling: 1
448+
--- !u!1 &1027556596
449+
GameObject:
450+
m_ObjectHideFlags: 0
451+
m_PrefabParentObject: {fileID: 1054075472835142, guid: a900c08743a94c328074df8bbe3eb63c,
452+
type: 2}
453+
m_PrefabInternal: {fileID: 0}
454+
serializedVersion: 5
455+
m_Component:
456+
- component: {fileID: 1027556597}
457+
- component: {fileID: 1027556599}
458+
- component: {fileID: 1027556598}
459+
m_Layer: 5
460+
m_Name: Subtitle5
461+
m_TagString: Untagged
462+
m_Icon: {fileID: 0}
463+
m_NavMeshLayer: 0
464+
m_StaticEditorFlags: 0
465+
m_IsActive: 1
466+
--- !u!224 &1027556597
467+
RectTransform:
468+
m_ObjectHideFlags: 0
469+
m_PrefabParentObject: {fileID: 224963507392718102, guid: a900c08743a94c328074df8bbe3eb63c,
470+
type: 2}
471+
m_PrefabInternal: {fileID: 0}
472+
m_GameObject: {fileID: 1027556596}
473+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
474+
m_LocalPosition: {x: 0, y: 0, z: -0.019088054}
475+
m_LocalScale: {x: 0.00049999997, y: 0.00049999997, z: 0.00049999997}
476+
m_Children: []
477+
m_Father: {fileID: 1323674719}
478+
m_RootOrder: 10
479+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
480+
m_AnchorMin: {x: 0.5, y: 0.5}
481+
m_AnchorMax: {x: 0.5, y: 0.5}
482+
m_AnchoredPosition: {x: -0.0001001358, y: -0.0894}
483+
m_SizeDelta: {x: 1107.8, y: 89.1924}
484+
m_Pivot: {x: 0.5, y: 0.5}
485+
--- !u!114 &1027556598
486+
MonoBehaviour:
487+
m_ObjectHideFlags: 0
488+
m_PrefabParentObject: {fileID: 114186135864427680, guid: a900c08743a94c328074df8bbe3eb63c,
489+
type: 2}
490+
m_PrefabInternal: {fileID: 0}
491+
m_GameObject: {fileID: 1027556596}
492+
m_Enabled: 1
493+
m_EditorHideFlags: 0
494+
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
495+
m_Name:
496+
m_EditorClassIdentifier:
497+
m_Material: {fileID: 0}
498+
m_Color: {r: 1, g: 1, b: 1, a: 1}
499+
m_RaycastTarget: 1
500+
m_OnCullStateChanged:
501+
m_PersistentCalls:
502+
m_Calls: []
503+
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
504+
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
505+
m_FontData:
506+
m_Font: {fileID: 12800000, guid: e869342c56e54acf989b2422b4b80dcc, type: 3}
507+
m_FontSize: 40
508+
m_FontStyle: 0
509+
m_BestFit: 0
510+
m_MinSize: 4
511+
m_MaxSize: 101
512+
m_Alignment: 0
513+
m_AlignByGeometry: 0
514+
m_RichText: 1
515+
m_HorizontalOverflow: 0
516+
m_VerticalOverflow: 0
517+
m_LineSpacing: 1
518+
m_Text: ' Show Boundary Walls'
519+
--- !u!222 &1027556599
520+
CanvasRenderer:
521+
m_ObjectHideFlags: 0
522+
m_PrefabParentObject: {fileID: 222823303811744904, guid: a900c08743a94c328074df8bbe3eb63c,
523+
type: 2}
524+
m_PrefabInternal: {fileID: 0}
525+
m_GameObject: {fileID: 1027556596}
364526
--- !u!1 &1229001241
365527
GameObject:
366528
m_ObjectHideFlags: 0
@@ -391,6 +553,84 @@ Transform:
391553
m_Father: {fileID: 0}
392554
m_RootOrder: 3
393555
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
556+
--- !u!1 &1275815548
557+
GameObject:
558+
m_ObjectHideFlags: 0
559+
m_PrefabParentObject: {fileID: 1054075472835142, guid: a900c08743a94c328074df8bbe3eb63c,
560+
type: 2}
561+
m_PrefabInternal: {fileID: 0}
562+
serializedVersion: 5
563+
m_Component:
564+
- component: {fileID: 1275815549}
565+
- component: {fileID: 1275815551}
566+
- component: {fileID: 1275815550}
567+
m_Layer: 5
568+
m_Name: Subtitle6
569+
m_TagString: Untagged
570+
m_Icon: {fileID: 0}
571+
m_NavMeshLayer: 0
572+
m_StaticEditorFlags: 0
573+
m_IsActive: 1
574+
--- !u!224 &1275815549
575+
RectTransform:
576+
m_ObjectHideFlags: 0
577+
m_PrefabParentObject: {fileID: 224963507392718102, guid: a900c08743a94c328074df8bbe3eb63c,
578+
type: 2}
579+
m_PrefabInternal: {fileID: 0}
580+
m_GameObject: {fileID: 1275815548}
581+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
582+
m_LocalPosition: {x: 0, y: 0, z: -0.019088054}
583+
m_LocalScale: {x: 0.00049999997, y: 0.00049999997, z: 0.00049999997}
584+
m_Children: []
585+
m_Father: {fileID: 1323674719}
586+
m_RootOrder: 11
587+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
588+
m_AnchorMin: {x: 0.5, y: 0.5}
589+
m_AnchorMax: {x: 0.5, y: 0.5}
590+
m_AnchoredPosition: {x: -0.0001001358, y: -0.15}
591+
m_SizeDelta: {x: 1107.8, y: 89.1924}
592+
m_Pivot: {x: 0.5, y: 0.5}
593+
--- !u!114 &1275815550
594+
MonoBehaviour:
595+
m_ObjectHideFlags: 0
596+
m_PrefabParentObject: {fileID: 114186135864427680, guid: a900c08743a94c328074df8bbe3eb63c,
597+
type: 2}
598+
m_PrefabInternal: {fileID: 0}
599+
m_GameObject: {fileID: 1275815548}
600+
m_Enabled: 1
601+
m_EditorHideFlags: 0
602+
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
603+
m_Name:
604+
m_EditorClassIdentifier:
605+
m_Material: {fileID: 0}
606+
m_Color: {r: 1, g: 1, b: 1, a: 1}
607+
m_RaycastTarget: 1
608+
m_OnCullStateChanged:
609+
m_PersistentCalls:
610+
m_Calls: []
611+
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
612+
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
613+
m_FontData:
614+
m_Font: {fileID: 12800000, guid: e869342c56e54acf989b2422b4b80dcc, type: 3}
615+
m_FontSize: 40
616+
m_FontStyle: 0
617+
m_BestFit: 0
618+
m_MinSize: 4
619+
m_MaxSize: 101
620+
m_Alignment: 0
621+
m_AlignByGeometry: 0
622+
m_RichText: 1
623+
m_HorizontalOverflow: 0
624+
m_VerticalOverflow: 0
625+
m_LineSpacing: 1
626+
m_Text: ' Show Boundary Ceiling'
627+
--- !u!222 &1275815551
628+
CanvasRenderer:
629+
m_ObjectHideFlags: 0
630+
m_PrefabParentObject: {fileID: 222823303811744904, guid: a900c08743a94c328074df8bbe3eb63c,
631+
type: 2}
632+
m_PrefabInternal: {fileID: 0}
633+
m_GameObject: {fileID: 1275815548}
394634
--- !u!1 &1289414259
395635
GameObject:
396636
m_ObjectHideFlags: 0
@@ -420,6 +660,11 @@ Transform:
420660
m_Father: {fileID: 0}
421661
m_RootOrder: 2
422662
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
663+
--- !u!224 &1323674719 stripped
664+
RectTransform:
665+
m_PrefabParentObject: {fileID: 224158120979208096, guid: a900c08743a94c328074df8bbe3eb63c,
666+
type: 2}
667+
m_PrefabInternal: {fileID: 310729792}
423668
--- !u!1 &1428268607
424669
GameObject:
425670
m_ObjectHideFlags: 0
@@ -571,7 +816,7 @@ MonoBehaviour:
571816
m_Script: {fileID: 11500000, guid: bf98dd1206224111a38765365e98e207, type: 3}
572817
m_Name:
573818
m_EditorClassIdentifier:
574-
cursorPrefab: {fileID: 1000012072213228, guid: 62718441f3682f94ab10c70a637e014b,
819+
cursorPrefab: {fileID: 1000012072213228, guid: 5b3e2856904e43c680f84f326861032a,
575820
type: 2}
576821
maxGazeCollisionDistance: 10
577822
raycastLayerMasks:

‎Assets/MixedRealityToolkit-Examples/Demos/Boundary/Scripts/BoundaryVisualizationDemo.cs‎

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License. See LICENSE in the project root for license information.
33

4-
using Microsoft.MixedReality.Toolkit.Internal.Definitions.BoundarySystem;
5-
using Microsoft.MixedReality.Toolkit.Internal.EventDatum.Boundary;
6-
using Microsoft.MixedReality.Toolkit.Internal.Interfaces.BoundarySystem;
7-
using Microsoft.MixedReality.Toolkit.Internal.Managers;
4+
using Microsoft.MixedReality.Toolkit.Core.Definitions.BoundarySystem;
5+
using Microsoft.MixedReality.Toolkit.Core.EventDatum.Boundary;
6+
using Microsoft.MixedReality.Toolkit.Core.Interfaces.BoundarySystem;
7+
using Microsoft.MixedReality.Toolkit.Core.Managers;
8+
using Microsoft.MixedReality.Toolkit.Core.Utilities;
89
using System.Collections.Generic;
910
using UnityEngine;
1011
using UnityEngine.Experimental.XR;
@@ -19,6 +20,7 @@ public class BoundaryVisualizationDemo : MonoBehaviour, IMixedRealityBoundaryHan
1920
private IMixedRealityBoundarySystem BoundaryManager => boundaryManager ?? (boundaryManager = MixedRealityManager.Instance.GetManager<IMixedRealityBoundarySystem>());
2021
private IMixedRealityBoundarySystem boundaryManager = null;
2122

23+
private GameObject markerParent;
2224
private readonly List<GameObject> markers = new List<GameObject>();
2325

2426
[SerializeField]
@@ -27,10 +29,27 @@ public class BoundaryVisualizationDemo : MonoBehaviour, IMixedRealityBoundaryHan
2729
[SerializeField]
2830
private bool showPlayArea = true;
2931

32+
[SerializeField]
33+
private bool showTrackedArea = true;
34+
35+
[SerializeField]
36+
private bool showBoundaryWalls = true;
37+
38+
[SerializeField]
39+
private bool showBoundaryCeiling = true;
40+
3041
#region MonoBehaviour Implementation
3142

43+
private void Awake()
44+
{
45+
markerParent = new GameObject();
46+
markerParent.name = "Boundary Demo Markers";
47+
markerParent.transform.parent = CameraCache.Main.transform.parent;
48+
}
49+
3250
private void Start()
3351
{
52+
3453
if (BoundaryManager != null)
3554
{
3655
if (markers.Count == 0)
@@ -46,6 +65,9 @@ private void Update()
4665
{
4766
BoundaryManager.ShowFloor = showFloor;
4867
BoundaryManager.ShowPlayArea = showPlayArea;
68+
BoundaryManager.ShowTrackedArea = showTrackedArea;
69+
BoundaryManager.ShowBoundaryWalls = showBoundaryWalls;
70+
BoundaryManager.ShowBoundaryCeiling = showBoundaryCeiling;
4971
}
5072
}
5173

@@ -128,7 +150,7 @@ private void AddMarkers()
128150
{
129151
GameObject marker = GameObject.CreatePrimitive(PrimitiveType.Sphere);
130152
marker.name = "Boundary Demo Marker";
131-
marker.transform.SetParent(transform);
153+
marker.transform.parent = markerParent.transform;
132154
marker.transform.position = position;
133155
marker.transform.localScale = Vector3.one * indicatorScale;
134156
marker.GetComponent<MeshRenderer>().sharedMaterial = material;

0 commit comments

Comments
 (0)