Skip to content

Commit fe372be

Browse files
David Kline (ANALOG)David Kline (ANALOG)
authored andcommitted
remove baseservicewithconstructor, update ext and data prov base classes
1 parent cba5149 commit fe372be

26 files changed

+244
-258
lines changed

Assets/MixedRealityToolkit.Providers/OpenVR/OpenVRDeviceManager.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using Microsoft.MixedReality.Toolkit.Core.Definitions;
66
using Microsoft.MixedReality.Toolkit.Core.Definitions.Devices;
77
using Microsoft.MixedReality.Toolkit.Core.Definitions.Utilities;
8+
using Microsoft.MixedReality.Toolkit.Core.Interfaces;
89
using Microsoft.MixedReality.Toolkit.Core.Interfaces.InputSystem;
910
using Microsoft.MixedReality.Toolkit.Core.Providers.UnityInput;
1011
using Microsoft.MixedReality.Toolkit.Core.Services;
@@ -24,10 +25,16 @@ public class OpenVRDeviceManager : UnityJoystickManager
2425
/// <summary>
2526
/// Constructor.
2627
/// </summary>
28+
/// <param name="registrar">The <see cref="IMixedRealityServiceRegistrar"/> instance that loaded the service.</param>
29+
/// <param name="spatialAwarenessSystem">The <see cref="IMixedRealitySpatialAwarenessSystem"/> to which the observer is providing data.</param>
2730
/// <param name="name">Friendly name of the service.</param>
2831
/// <param name="priority">Service priority. Used to determine order of instantiation.</param>
2932
/// <param name="profile">The service's configuration profile.</param>
30-
public OpenVRDeviceManager(string name, uint priority, BaseMixedRealityProfile profile) : base(name, priority, profile) { }
33+
public OpenVRDeviceManager(
34+
IMixedRealityServiceRegistrar registrar,
35+
string name = null,
36+
uint priority = DefaultPriority,
37+
BaseMixedRealityProfile profile = null) : base(registrar, name, priority, profile) { }
3138

3239
#region Controller Utilities
3340

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealityDeviceManager.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,15 @@ public class WindowsMixedRealityDeviceManager : BaseDeviceManager, IMixedReality
3131
/// <summary>
3232
/// Constructor.
3333
/// </summary>
34+
/// <param name="registrar">The <see cref="IMixedRealityServiceRegistrar"/> instance that loaded the service.</param>
3435
/// <param name="name">Friendly name of the service.</param>
3536
/// <param name="priority">Service priority. Used to determine order of instantiation.</param>
3637
/// <param name="profile">The service's configuration profile.</param>
37-
public WindowsMixedRealityDeviceManager(string name, uint priority, BaseMixedRealityProfile profile) : base(name, priority, profile) { }
38+
public WindowsMixedRealityDeviceManager(
39+
IMixedRealityServiceRegistrar registrar,
40+
string name = null,
41+
uint priority = DefaultPriority,
42+
BaseMixedRealityProfile profile = null) : base(registrar, name, priority, profile) { }
3843

3944
#if UNITY_WSA
4045

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealitySpatialMeshObserver.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using Microsoft.MixedReality.Toolkit.Core.Definitions;
66
using Microsoft.MixedReality.Toolkit.Core.Definitions.SpatialAwarenessSystem;
77
using Microsoft.MixedReality.Toolkit.Core.Definitions.Utilities;
8+
using Microsoft.MixedReality.Toolkit.Core.Interfaces;
89
using Microsoft.MixedReality.Toolkit.Core.Interfaces.SpatialAwarenessSystem;
910
using Microsoft.MixedReality.Toolkit.Core.Interfaces.SpatialAwarenessSystem.Observers;
1011
using Microsoft.MixedReality.Toolkit.Core.Providers;
@@ -28,10 +29,16 @@ public class WindowsMixedRealitySpatialMeshObserver : BaseSpatialObserver, IMixe
2829
/// <summary>
2930
/// Constructor.
3031
/// </summary>
32+
/// <param name="registrar">The <see cref="IMixedRealityServiceRegistrar"/> instance that loaded the service.</param>
3133
/// <param name="name">Friendly name of the service.</param>
3234
/// <param name="priority">Service priority. Used to determine order of instantiation.</param>
3335
/// <param name="profile">The service's configuration profile.</param>
34-
public WindowsMixedRealitySpatialMeshObserver(string name, uint priority, BaseMixedRealityProfile profile) : base(name, priority, profile)
36+
public WindowsMixedRealitySpatialMeshObserver(
37+
IMixedRealityServiceRegistrar registrar,
38+
IMixedRealitySpatialAwarenessSystem spatialAwarenessSystem,
39+
string name = null,
40+
uint priority = DefaultPriority,
41+
BaseMixedRealityProfile profile = null) : base(registrar, spatialAwarenessSystem, name, priority, profile)
3542
{
3643
ReadProfile();
3744
}

Assets/MixedRealityToolkit.Providers/WindowsVoiceInput/WindowsDictationInputProvider.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using Microsoft.MixedReality.Toolkit.Core.Attributes;
55
using Microsoft.MixedReality.Toolkit.Core.Definitions;
66
using Microsoft.MixedReality.Toolkit.Core.Definitions.Utilities;
7+
using Microsoft.MixedReality.Toolkit.Core.Interfaces;
78
using Microsoft.MixedReality.Toolkit.Core.Interfaces.Devices;
89
using Microsoft.MixedReality.Toolkit.Core.Interfaces.InputSystem;
910
using Microsoft.MixedReality.Toolkit.Core.Providers;
@@ -27,10 +28,15 @@ public class WindowsDictationInputProvider : BaseDeviceManager, IMixedRealityDic
2728
/// <summary>
2829
/// Constructor.
2930
/// </summary>
31+
/// <param name="registrar">The <see cref="IMixedRealityServiceRegistrar"/> instance that loaded the service.</param>
3032
/// <param name="name">Friendly name of the service.</param>
3133
/// <param name="priority">Service priority. Used to determine order of instantiation.</param>
3234
/// <param name="profile">The service's configuration profile.</param>
33-
public WindowsDictationInputProvider(string name, uint priority, BaseMixedRealityProfile profile) : base(name, priority, profile) { }
35+
public WindowsDictationInputProvider(
36+
IMixedRealityServiceRegistrar registrar,
37+
string name = null,
38+
uint priority = DefaultPriority,
39+
BaseMixedRealityProfile profile = null) : base(registrar, name, priority, profile) { }
3440

3541
/// <summary>
3642
/// Is the Dictation Manager currently running?

Assets/MixedRealityToolkit.Providers/WindowsVoiceInput/WindowsSpeechInputProvider.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using Microsoft.MixedReality.Toolkit.Core.Definitions;
66
using Microsoft.MixedReality.Toolkit.Core.Definitions.InputSystem;
77
using Microsoft.MixedReality.Toolkit.Core.Definitions.Utilities;
8+
using Microsoft.MixedReality.Toolkit.Core.Interfaces;
89
using Microsoft.MixedReality.Toolkit.Core.Interfaces.Devices;
910
using Microsoft.MixedReality.Toolkit.Core.Interfaces.InputSystem;
1011
using Microsoft.MixedReality.Toolkit.Core.Providers;
@@ -26,10 +27,15 @@ public class WindowsSpeechInputProvider : BaseDeviceManager, IMixedRealitySpeech
2627
/// <summary>
2728
/// Constructor.
2829
/// </summary>
30+
/// <param name="registrar">The <see cref="IMixedRealityServiceRegistrar"/> instance that loaded the service.</param>
2931
/// <param name="name">Friendly name of the service.</param>
3032
/// <param name="priority">Service priority. Used to determine order of instantiation.</param>
3133
/// <param name="profile">The service's configuration profile.</param>
32-
public WindowsSpeechInputProvider(string name, uint priority, BaseMixedRealityProfile profile) : base(name, priority, profile) { }
34+
public WindowsSpeechInputProvider(
35+
IMixedRealityServiceRegistrar registrar,
36+
string name = null,
37+
uint priority = DefaultPriority,
38+
BaseMixedRealityProfile profile = null) : base(registrar, name, priority, profile) { }
3339

3440
/// <summary>
3541
/// The keywords to be recognized and optional keyboard shortcuts.

0 commit comments

Comments
 (0)