Skip to content

Commit 06616a3

Browse files
StephenHodgsonStephenHodgson
authored
Merge pull request #2922 from StephenHodgson/vNEXT-Revolution
Refactored Manager concept into Services
2 parents d82c164 + 9ed442a commit 06616a3

File tree

113 files changed

+1426
-1556
lines changed

Some content is hidden

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

113 files changed

+1426
-1556
lines changed

‎Assets/MixedRealityToolkit-Examples/Demos/Audio/Scenes/AudioLoFiEffectDemo.unity‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ GameObject:
153153
- component: {fileID: 431339712}
154154
- component: {fileID: 431339711}
155155
m_Layer: 0
156-
m_Name: MixedRealityManager
156+
m_Name: MixedRealityToolkit
157157
m_TagString: Untagged
158158
m_Icon: {fileID: 0}
159159
m_NavMeshLayer: 0

‎Assets/MixedRealityToolkit-Examples/Demos/Audio/Scenes/AudioOcclusionDemo.unity‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ GameObject:
542542
- component: {fileID: 979633973}
543543
- component: {fileID: 979633972}
544544
m_Layer: 0
545-
m_Name: MixedRealityManager
545+
m_Name: MixedRealityToolkit
546546
m_TagString: Untagged
547547
m_Icon: {fileID: 0}
548548
m_NavMeshLayer: 0

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@ GameObject:
740740
- component: {fileID: 1485507613}
741741
- component: {fileID: 1485507612}
742742
m_Layer: 0
743-
m_Name: MixedRealityManager
743+
m_Name: MixedRealityToolkit
744744
m_TagString: Untagged
745745
m_Icon: {fileID: 0}
746746
m_NavMeshLayer: 0

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

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
using Microsoft.MixedReality.Toolkit.Core.Definitions.BoundarySystem;
55
using Microsoft.MixedReality.Toolkit.Core.EventDatum.Boundary;
66
using Microsoft.MixedReality.Toolkit.Core.Interfaces.BoundarySystem;
7-
using Microsoft.MixedReality.Toolkit.Core.Managers;
8-
using Microsoft.MixedReality.Toolkit.Core.Utilities;
7+
using Microsoft.MixedReality.Toolkit.Core.Services;
98
using System.Collections.Generic;
109
using Microsoft.MixedReality.Toolkit.Core.Utilities.Async;
1110
using UnityEngine;
@@ -42,13 +41,13 @@ private void Awake()
4241
{
4342
markerParent = new GameObject();
4443
markerParent.name = "Boundary Demo Markers";
45-
markerParent.transform.parent = MixedRealityManager.Instance.MixedRealityPlayspace;
44+
markerParent.transform.parent = MixedRealityToolkit.Instance.MixedRealityPlayspace;
4645
}
4746

4847
private void Start()
4948
{
5049

51-
if (MixedRealityManager.BoundarySystem != null)
50+
if (MixedRealityToolkit.BoundarySystem != null)
5251
{
5352
if (markers.Count == 0)
5453
{
@@ -59,25 +58,25 @@ private void Start()
5958

6059
private void Update()
6160
{
62-
if (MixedRealityManager.BoundarySystem != null)
61+
if (MixedRealityToolkit.BoundarySystem != null)
6362
{
64-
MixedRealityManager.BoundarySystem.ShowFloor = showFloor;
65-
MixedRealityManager.BoundarySystem.ShowPlayArea = showPlayArea;
66-
MixedRealityManager.BoundarySystem.ShowTrackedArea = showTrackedArea;
67-
MixedRealityManager.BoundarySystem.ShowBoundaryWalls = showBoundaryWalls;
68-
MixedRealityManager.BoundarySystem.ShowBoundaryCeiling = showBoundaryCeiling;
63+
MixedRealityToolkit.BoundarySystem.ShowFloor = showFloor;
64+
MixedRealityToolkit.BoundarySystem.ShowPlayArea = showPlayArea;
65+
MixedRealityToolkit.BoundarySystem.ShowTrackedArea = showTrackedArea;
66+
MixedRealityToolkit.BoundarySystem.ShowBoundaryWalls = showBoundaryWalls;
67+
MixedRealityToolkit.BoundarySystem.ShowBoundaryCeiling = showBoundaryCeiling;
6968
}
7069
}
7170

7271
private async void OnEnable()
7372
{
74-
await new WaitUntil(() => MixedRealityManager.BoundarySystem != null);
75-
MixedRealityManager.BoundarySystem.Register(gameObject);
73+
await new WaitUntil(() => MixedRealityToolkit.BoundarySystem != null);
74+
MixedRealityToolkit.BoundarySystem.Register(gameObject);
7675
}
7776

7877
private void OnDisable()
7978
{
80-
MixedRealityManager.BoundarySystem?.Unregister(gameObject);
79+
MixedRealityToolkit.BoundarySystem?.Unregister(gameObject);
8180
}
8281

8382
#endregion MonoBehaviour Implementation
@@ -104,13 +103,13 @@ private void AddMarkers()
104103
float widthRect;
105104
float heightRect;
106105

107-
if (!MixedRealityManager.BoundarySystem.TryGetRectangularBoundsParams(out centerRect, out angleRect, out widthRect, out heightRect))
106+
if (!MixedRealityToolkit.BoundarySystem.TryGetRectangularBoundsParams(out centerRect, out angleRect, out widthRect, out heightRect))
108107
{
109108
// If we have no boundary manager or rectangular bounds we will show no indicators
110109
return;
111110
}
112111

113-
MixedRealityBoundaryVisualizationProfile visualizationProfile = MixedRealityManager.Instance.ActiveProfile.BoundaryVisualizationProfile;
112+
MixedRealityBoundaryVisualizationProfile visualizationProfile = MixedRealityToolkit.Instance.ActiveProfile.BoundaryVisualizationProfile;
114113
if (visualizationProfile == null)
115114
{
116115
// We do not have a visualization profile configured, therefore do not render the indicators.
@@ -135,12 +134,12 @@ private void AddMarkers()
135134

136135
Material material = null;
137136
// Check inscribed rectangle first
138-
if (MixedRealityManager.BoundarySystem.Contains(position, Boundary.Type.PlayArea))
137+
if (MixedRealityToolkit.BoundarySystem.Contains(position, Boundary.Type.PlayArea))
139138
{
140139
material = visualizationProfile.PlayAreaMaterial;
141140
}
142141
// Then check geometry
143-
else if (MixedRealityManager.BoundarySystem.Contains(position, Boundary.Type.TrackedArea))
142+
else if (MixedRealityToolkit.BoundarySystem.Contains(position, Boundary.Type.TrackedArea))
144143
{
145144
material = visualizationProfile.TrackedAreaMaterial;
146145
}

‎Assets/MixedRealityToolkit-Examples/Demos/Solvers/Scenes/Solvers.unity‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2300,7 +2300,7 @@ GameObject:
23002300
- component: {fileID: 1540929158}
23012301
- component: {fileID: 1540929157}
23022302
m_Layer: 0
2303-
m_Name: MixedRealityManager
2303+
m_Name: MixedRealityToolkit
23042304
m_TagString: Untagged
23052305
m_Icon: {fileID: 0}
23062306
m_NavMeshLayer: 0

‎Assets/MixedRealityToolkit-Examples/Demos/StandardShader/Scenes/MaterialGallery.unity‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4441,7 +4441,7 @@ GameObject:
44414441
- component: {fileID: 1485507613}
44424442
- component: {fileID: 1485507612}
44434443
m_Layer: 0
4444-
m_Name: MixedRealityManager
4444+
m_Name: MixedRealityToolkit
44454445
m_TagString: Untagged
44464446
m_Icon: {fileID: 0}
44474447
m_NavMeshLayer: 0

‎Assets/MixedRealityToolkit-Examples/Demos/StandardShader/Scenes/StandardMaterialComparison.unity‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13552,7 +13552,7 @@ GameObject:
1355213552
- component: {fileID: 1485507613}
1355313553
- component: {fileID: 1485507612}
1355413554
m_Layer: 0
13555-
m_Name: MixedRealityManager
13555+
m_Name: MixedRealityToolkit
1355613556
m_TagString: Untagged
1355713557
m_Icon: {fileID: 0}
1355813558
m_NavMeshLayer: 0

‎Assets/MixedRealityToolkit-Examples/Demos/StandardShader/Scenes/StandardMaterials.unity‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5230,7 +5230,7 @@ GameObject:
52305230
- component: {fileID: 1485507613}
52315231
- component: {fileID: 1485507612}
52325232
m_Layer: 0
5233-
m_Name: MixedRealityManager
5233+
m_Name: MixedRealityToolkit
52345234
m_TagString: Untagged
52355235
m_Icon: {fileID: 0}
52365236
m_NavMeshLayer: 0

‎Assets/MixedRealityToolkit-Examples/Demos/UX/Collections/Scenes/ObjectCollectionGallery.unity‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3039,7 +3039,7 @@ GameObject:
30393039
- component: {fileID: 785226068}
30403040
- component: {fileID: 785226067}
30413041
m_Layer: 0
3042-
m_Name: MixedRealityManager
3042+
m_Name: MixedRealityToolkit
30433043
m_TagString: Untagged
30443044
m_Icon: {fileID: 0}
30453045
m_NavMeshLayer: 0

‎Assets/MixedRealityToolkit-Examples/Demos/UX/Lines/Scenes/LineGallery.unity‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -887,7 +887,7 @@ GameObject:
887887
- component: {fileID: 785226068}
888888
- component: {fileID: 785226067}
889889
m_Layer: 0
890-
m_Name: MixedRealityManager
890+
m_Name: MixedRealityToolkit
891891
m_TagString: Untagged
892892
m_Icon: {fileID: 0}
893893
m_NavMeshLayer: 0
@@ -1383,7 +1383,7 @@ RectTransform:
13831383
m_AnchorMin: {x: 0, y: 0}
13841384
m_AnchorMax: {x: 0, y: 0}
13851385
m_AnchoredPosition: {x: 0, y: 0}
1386-
m_SizeDelta: {x: 0, y: 64}
1386+
m_SizeDelta: {x: 0, y: 50}
13871387
m_Pivot: {x: 0.5, y: 1}
13881388
--- !u!114 &1264058820
13891389
MonoBehaviour:
@@ -1433,8 +1433,8 @@ MonoBehaviour:
14331433
m_outlineColor:
14341434
serializedVersion: 2
14351435
rgba: 4278190080
1436-
m_fontSize: 24
1437-
m_fontSizeBase: 24
1436+
m_fontSize: 36
1437+
m_fontSizeBase: 36
14381438
m_fontWeight: 400
14391439
m_enableAutoSizing: 0
14401440
m_fontSizeMin: 18
@@ -1451,7 +1451,7 @@ MonoBehaviour:
14511451
m_enableWordWrapping: 1
14521452
m_wordWrappingRatios: 0.4
14531453
m_overflowMode: 0
1454-
m_firstOverflowCharacterIndex: -1
1454+
m_firstOverflowCharacterIndex: 9
14551455
m_linkedTextComponent: {fileID: 0}
14561456
m_isLinkedTextComponent: 0
14571457
m_isTextTruncated: 0
@@ -1760,7 +1760,7 @@ MonoBehaviour:
17601760
\u2013 creates insances of a mesh, then places them along the length of the line</indent>\n\u2022<indent=3%>StripMeshLineRenderer
17611761
\u2013 draws a strip of polygons along the length of the line</indent>"
17621762
m_isRightToLeft: 0
1763-
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
1763+
m_fontAsset: {fileID: 0}
17641764
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
17651765
m_fontSharedMaterials: []
17661766
m_fontMaterial: {fileID: 0}

0 commit comments

Comments
 (0)