Skip to content

Commit aaf1031

Browse files
author
David Kline (ANALOG)
committed
update from pr feedback
1 parent af37106 commit aaf1031

File tree

5 files changed

+11
-21
lines changed

5 files changed

+11
-21
lines changed

Assets/MixedRealityToolkit.Services/BoundarySystem/MixedRealityBoundarySystem.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,6 @@ public bool Contains(Vector3 location, Boundary.Type boundaryType = Boundary.Typ
590590
}
591591

592592
// Handle the user teleporting (boundary moves with them).
593-
// todo: update...
594593
location = Playspace.InverseTransformPoint(location);
595594

596595
if (FloorHeight.Value > location.y ||
@@ -634,7 +633,6 @@ public bool TryGetRectangularBoundsParams(out Vector2 center, out float angle, o
634633
}
635634

636635
// Handle the user teleporting (boundary moves with them).
637-
// todo: update...
638636
Vector3 transformedCenter = Playspace.TransformPoint(
639637
new Vector3(rectangularBounds.Center.x, 0f, rectangularBounds.Center.y));
640638

@@ -670,7 +668,6 @@ public GameObject GetFloorVisualization()
670668
currentFloorObject = GameObject.CreatePrimitive(PrimitiveType.Cube);
671669
currentFloorObject.name = "Boundary System Floor";
672670
currentFloorObject.transform.localScale = new Vector3(floorScale.x, boundaryObjectThickness, floorScale.y);
673-
// todo: update...
674671
currentFloorObject.transform.Translate(new Vector3(
675672
Playspace.position.x,
676673
FloorHeight.Value - (currentFloorObject.transform.localScale.y * 0.5f),
@@ -758,7 +755,6 @@ public GameObject GetTrackedAreaVisualization()
758755
currentTrackedAreaObject = new GameObject("Tracked Area");
759756
currentTrackedAreaObject.layer = ignoreRaycastLayerValue;
760757
currentTrackedAreaObject.AddComponent<LineRenderer>();
761-
// todo: update...
762758
currentTrackedAreaObject.transform.Translate(new Vector3(
763759
Playspace.position.x,
764760
boundaryObjectRenderOffset,

Assets/MixedRealityToolkit.Services/InputSystem/MixedRealityInputSystem.cs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,11 @@ public override void Initialize()
103103
bool addedComponents = false;
104104

105105
MixedRealityInputSystemProfile profile = ConfigurationProfile as MixedRealityInputSystemProfile;
106-
if (profile == null) { return; }
106+
if (profile == null)
107+
{
108+
Debug.LogError("The Input system is missing the required Input System Profile!");
109+
return;
110+
}
107111

108112
if (!Application.isPlaying)
109113
{
@@ -142,12 +146,6 @@ public override void Initialize()
142146
CameraCache.Main.gameObject.EnsureComponent<StandaloneInputModule>();
143147
}
144148

145-
if (profile == null)
146-
{
147-
Debug.LogError("The Input system is missing the required Input System Profile!");
148-
return;
149-
}
150-
151149
if (profile.InputActionRulesProfile != null)
152150
{
153151
CurrentInputActionRulesProfile = profile.InputActionRulesProfile;

Assets/MixedRealityToolkit/Interfaces/SpatialAwareness/Observers/IMixedRealitySpatialAwarenessMeshObserver.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// Licensed under the MIT License. See LICENSE in the project root for license information.
33

44
using Microsoft.MixedReality.Toolkit.Core.Definitions.SpatialAwarenessSystem;
5-
65
using System.Collections.Generic;
76
using UnityEngine;
87

Assets/MixedRealityToolkit/Providers/BaseDeviceManager.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ namespace Microsoft.MixedReality.Toolkit.Core.Providers
1515
/// <summary>
1616
/// Base Device manager to inherit from.
1717
/// </summary>
18-
// todo: inherit BaseDataProvider...
1918
public class BaseDeviceManager : BaseExtensionService, IMixedRealityDeviceManager
2019
{
2120
/// <summary>

Assets/MixedRealityToolkit/Services/MixedRealityToolkit.cs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ private void InitializeServiceLocator()
399399
#if UNITY_EDITOR
400400
LayerExtensions.SetupLayer(31, "Spatial Awareness");
401401
#endif
402-
object[] args = { this }; // todo: add profile
402+
object[] args = { this };
403403
if (!RegisterService<IMixedRealitySpatialAwarenessSystem>(ActiveProfile.SpatialAwarenessSystemSystemType, args: args) && SpatialAwarenessSystem != null)
404404
{
405405
Debug.LogError("Failed to start the Spatial Awareness System!");
@@ -433,7 +433,6 @@ private void InitializeServiceLocator()
433433

434434
if (typeof(IMixedRealityDataProvider).IsAssignableFrom(configuration.ComponentType.Type))
435435
{
436-
// todo: pass the service instance to the data provider
437436
RegisterService<IMixedRealityDataProvider>(configuration.ComponentType, configuration.RuntimePlatform, this, null, configuration.ComponentName, configuration.Priority, configuration.ConfigurationProfile);
438437

439438
}
@@ -443,7 +442,7 @@ private void InitializeServiceLocator()
443442
}
444443
else
445444
{
446-
// todo: unsupported type
445+
Debug.LogWarning($"{configuration.ComponentName} does not implement IMixedRealityDataProvider or IMixedRealityExtensionService and could not be registered");
447446
}
448447
}
449448
}
@@ -729,11 +728,10 @@ public Transform MixedRealityPlayspace
729728
#if UNITY_EDITOR
730729
private void OnValidate()
731730
{
732-
// todo: trying something
733-
//if (!newInstanceBeingInitialized && !IsInitialized && !UnityEditor.EditorApplication.isPlayingOrWillChangePlaymode)
734-
//{
735-
// ConfirmInitialized();
736-
//}
731+
if (!newInstanceBeingInitialized && !IsInitialized && !UnityEditor.EditorApplication.isPlayingOrWillChangePlaymode)
732+
{
733+
ConfirmInitialized();
734+
}
737735
}
738736
#endif // UNITY_EDITOR
739737

0 commit comments

Comments
 (0)