Skip to content

Commit c1b65ed

Browse files
StephenHodgsonStephenHodgson
committed
Merge branch 'mrtk_development' into vNEXT-SpeechInputHandlerUpdate
# Conflicts: # Assets/MixedRealityToolkit-SDK/Inspectors/Input/Handlers/SpeechInputHandlerInspector.cs
2 parents 281e2ca + 06616a3 commit c1b65ed

File tree

148 files changed

+3743
-2609
lines changed

Some content is hidden

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

148 files changed

+3743
-2609
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/Prefabs/SolverSwappingVolume.prefab‎

Lines changed: 2 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -64,25 +64,6 @@ GameObject:
6464
m_NavMeshLayer: 0
6565
m_StaticEditorFlags: 0
6666
m_IsActive: 1
67-
--- !u!1 &1806980022041722
68-
GameObject:
69-
m_ObjectHideFlags: 0
70-
m_PrefabParentObject: {fileID: 0}
71-
m_PrefabInternal: {fileID: 100100000}
72-
serializedVersion: 5
73-
m_Component:
74-
- component: {fileID: 4532111562577858}
75-
- component: {fileID: 114537914091800886}
76-
- component: {fileID: 114720463534382782}
77-
- component: {fileID: 33793527096412838}
78-
- component: {fileID: 23348121759550618}
79-
m_Layer: 0
80-
m_Name: ChaseSource
81-
m_TagString: Untagged
82-
m_Icon: {fileID: 0}
83-
m_NavMeshLayer: 0
84-
m_StaticEditorFlags: 0
85-
m_IsActive: 1
8667
--- !u!1 &1859447626459620
8768
GameObject:
8869
m_ObjectHideFlags: 1
@@ -111,7 +92,6 @@ Transform:
11192
m_LocalPosition: {x: -0.5, y: 1.09, z: 1.4}
11293
m_LocalScale: {x: 0.25, y: 0.25, z: 0.25}
11394
m_Children:
114-
- {fileID: 4532111562577858}
11595
- {fileID: 4440517697149476}
11696
m_Father: {fileID: 0}
11797
m_RootOrder: 0
@@ -129,19 +109,6 @@ Transform:
129109
- {fileID: 224604559336910218}
130110
- {fileID: 4790300607699990}
131111
m_Father: {fileID: 4348569316050982}
132-
m_RootOrder: 1
133-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
134-
--- !u!4 &4532111562577858
135-
Transform:
136-
m_ObjectHideFlags: 1
137-
m_PrefabParentObject: {fileID: 0}
138-
m_PrefabInternal: {fileID: 100100000}
139-
m_GameObject: {fileID: 1806980022041722}
140-
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
141-
m_LocalPosition: {x: 0, y: 0, z: 0}
142-
m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
143-
m_Children: []
144-
m_Father: {fileID: 4348569316050982}
145112
m_RootOrder: 0
146113
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
147114
--- !u!4 &4790300607699990
@@ -227,41 +194,6 @@ MeshRenderer:
227194
m_SortingLayerID: 0
228195
m_SortingLayer: 0
229196
m_SortingOrder: 0
230-
--- !u!23 &23348121759550618
231-
MeshRenderer:
232-
m_ObjectHideFlags: 1
233-
m_PrefabParentObject: {fileID: 0}
234-
m_PrefabInternal: {fileID: 100100000}
235-
m_GameObject: {fileID: 1806980022041722}
236-
m_Enabled: 1
237-
m_CastShadows: 1
238-
m_ReceiveShadows: 1
239-
m_DynamicOccludee: 1
240-
m_MotionVectors: 1
241-
m_LightProbeUsage: 1
242-
m_ReflectionProbeUsage: 1
243-
m_RenderingLayerMask: 4294967295
244-
m_Materials:
245-
- {fileID: 2100000, guid: c4a1b7475a654dd0acaa0cfdfba2e20c, type: 2}
246-
m_StaticBatchInfo:
247-
firstSubMesh: 0
248-
subMeshCount: 0
249-
m_StaticBatchRoot: {fileID: 0}
250-
m_ProbeAnchor: {fileID: 0}
251-
m_LightProbeVolumeOverride: {fileID: 0}
252-
m_ScaleInLightmap: 1
253-
m_PreserveUVs: 0
254-
m_IgnoreNormalsForChartDetection: 0
255-
m_ImportantGI: 0
256-
m_StitchLightmapSeams: 0
257-
m_SelectedEditorRenderState: 3
258-
m_MinimumChartSize: 4
259-
m_AutoUVMaxDistance: 0.5
260-
m_AutoUVMaxAngle: 89
261-
m_LightmapParameters: {fileID: 0}
262-
m_SortingLayerID: 0
263-
m_SortingLayer: 0
264-
m_SortingOrder: 0
265197
--- !u!33 &33043184315017164
266198
MeshFilter:
267199
m_ObjectHideFlags: 1
@@ -276,13 +208,6 @@ MeshFilter:
276208
m_PrefabInternal: {fileID: 100100000}
277209
m_GameObject: {fileID: 1687025458477342}
278210
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
279-
--- !u!33 &33793527096412838
280-
MeshFilter:
281-
m_ObjectHideFlags: 1
282-
m_PrefabParentObject: {fileID: 0}
283-
m_PrefabInternal: {fileID: 100100000}
284-
m_GameObject: {fileID: 1806980022041722}
285-
m_Mesh: {fileID: 4300000, guid: 841b5755ac02dbc439bd347f414de999, type: 3}
286211
--- !u!54 &54233848105879872
287212
Rigidbody:
288213
m_ObjectHideFlags: 1
@@ -354,55 +279,9 @@ MonoBehaviour:
354279
m_Script: {fileID: 11500000, guid: edea428b5e02f9144b45b9fbd5ba5278, type: 3}
355280
m_Name:
356281
m_EditorClassIdentifier:
357-
hideThisObject: {fileID: 1806980022041722}
358-
spawnThisPrefab: {fileID: 1307245229378308, guid: de99acdc648a6d945ba138103ed87328,
359-
type: 2}
282+
hideThisObject: {fileID: 0}
283+
spawnThisPrefab: {fileID: 0}
360284
updateSolverTargetToClickSource: 1
361-
--- !u!114 &114537914091800886
362-
MonoBehaviour:
363-
m_ObjectHideFlags: 1
364-
m_PrefabParentObject: {fileID: 0}
365-
m_PrefabInternal: {fileID: 100100000}
366-
m_GameObject: {fileID: 1806980022041722}
367-
m_Enabled: 0
368-
m_EditorHideFlags: 0
369-
m_Script: {fileID: 11500000, guid: b55691ad5b034fe6966763a6e23818d2, type: 3}
370-
m_Name:
371-
m_EditorClassIdentifier:
372-
handedness: 1
373-
trackedObjectToReference: 2
374-
additionalOffset: {x: 0, y: 0, z: 0}
375-
additionalRotation: {x: 0, y: 0, z: 0}
376-
transformTarget: {fileID: 0}
377-
updateSolvers: 1
378-
--- !u!114 &114720463534382782
379-
MonoBehaviour:
380-
m_ObjectHideFlags: 1
381-
m_PrefabParentObject: {fileID: 0}
382-
m_PrefabInternal: {fileID: 100100000}
383-
m_GameObject: {fileID: 1806980022041722}
384-
m_Enabled: 0
385-
m_EditorHideFlags: 0
386-
m_Script: {fileID: 11500000, guid: 4684083f6dff4a1d8a790bccc354fcf4, type: 3}
387-
m_Name:
388-
m_EditorClassIdentifier:
389-
updateLinkedTransform: 0
390-
moveLerpTime: 0.1
391-
rotateLerpTime: 0.1
392-
scaleLerpTime: 0
393-
maintainScale: 1
394-
smoothing: 1
395-
lifetime: 0
396-
SolverHandler: {fileID: 114537914091800886}
397-
referenceDirection: 0
398-
minDistance: 0.1
399-
maxDistance: 0.1
400-
minViewDegrees: 0
401-
maxViewDegrees: 0
402-
aspectV: 1
403-
ignoreAngleClamp: 0
404-
ignoreDistanceClamp: 0
405-
orientToReferenceDirection: 0
406285
--- !u!135 &135082391517649018
407286
SphereCollider:
408287
m_ObjectHideFlags: 1

‎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/Solvers/Scripts/SwapVolume.cs.meta‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎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

0 commit comments

Comments
 (0)