Merge pull request #2690 from StephenHodgson/vNEXT-RenameDeviceManager

David Kline · web-flow · commit cabf74d13a74 · 2018-09-05T09:29:13.000-07:00
Renamed Unity Device Manager
diff --git a/Assets/MixedRealityToolkit/_Core/Devices/OpenVR/GenericOpenVRController.cs b/Assets/MixedRealityToolkit/_Core/Devices/OpenVR/GenericOpenVRController.cs
@@ -12,7 +12,7 @@
 
 namespace Microsoft.MixedReality.Toolkit.Core.Devices.OpenVR
 {
-    public class GenericOpenVRController : GenericUnityController
+    public class GenericOpenVRController : GenericJoystickController
     {
         public GenericOpenVRController(TrackingState trackingState, Handedness controllerHandedness, IMixedRealityInputSource inputSource = null, MixedRealityInteractionMapping[] interactions = null)
             : base(trackingState, controllerHandedness, inputSource, interactions)
diff --git a/Assets/MixedRealityToolkit/_Core/Devices/OpenVR/OpenVRDeviceManager.cs b/Assets/MixedRealityToolkit/_Core/Devices/OpenVR/OpenVRDeviceManager.cs
@@ -12,7 +12,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Devices.OpenVR
     /// <summary>
     /// Manages Open VR Devices using unity's input system.
     /// </summary>
-    public class OpenVRDeviceManager : UnityDeviceManager
+    public class OpenVRDeviceManager : UnityJoystickManager
     {
         /// <summary>
         /// Constructor.
@@ -24,7 +24,7 @@ public OpenVRDeviceManager(string name, uint priority) : base(name, priority) {
         #region Controller Utilities
 
         /// <inheritdoc />
-        protected override GenericUnityController GetOrAddController(string joystickName)
+        protected override GenericJoystickController GetOrAddController(string joystickName)
         {
             // If a device is already registered with the ID provided, just return it.
             if (ActiveControllers.ContainsKey(joystickName))
diff --git a/Assets/MixedRealityToolkit/_Core/Devices/UnityInput/GenericJoystickController.cs b/Assets/MixedRealityToolkit/_Core/Devices/UnityInput/GenericJoystickController.cs
@@ -8,9 +8,9 @@
 
 namespace Microsoft.MixedReality.Toolkit.Core.Devices.UnityInput
 {
-    public class GenericUnityController : BaseController
+    public class GenericJoystickController : BaseController
     {
-        public GenericUnityController(TrackingState trackingState, Handedness controllerHandedness, IMixedRealityInputSource inputSource = null, MixedRealityInteractionMapping[] interactions = null)
+        public GenericJoystickController(TrackingState trackingState, Handedness controllerHandedness, IMixedRealityInputSource inputSource = null, MixedRealityInteractionMapping[] interactions = null)
                 : base(trackingState, controllerHandedness, inputSource, interactions)
         {
         }
diff --git a/Assets/MixedRealityToolkit/_Core/Devices/UnityInput/GenericJoystickController.cs.meta b/Assets/MixedRealityToolkit/_Core/Devices/UnityInput/GenericJoystickController.cs.meta
diff --git a/Assets/MixedRealityToolkit/_Core/Devices/UnityInput/UnityJoystickManager.cs b/Assets/MixedRealityToolkit/_Core/Devices/UnityInput/UnityJoystickManager.cs
@@ -12,20 +12,20 @@
 namespace Microsoft.MixedReality.Toolkit.Core.Devices.UnityInput
 {
     /// <summary>
-    /// Manages devices using unity input system.
+    /// Manages joysticks using unity input system.
     /// </summary>
-    public class UnityDeviceManager : BaseDeviceManager
+    public class UnityJoystickManager : BaseDeviceManager
     {
         /// <summary>
         /// Constructor.
         /// </summary>
         /// <param name="name"></param>
         /// <param name="priority"></param>
-        public UnityDeviceManager(string name, uint priority) : base(name, priority) { }
+        public UnityJoystickManager(string name, uint priority) : base(name, priority) { }
 
         private const float DeviceRefreshInterval = 3.0f;
 
-        protected static readonly Dictionary<string, GenericUnityController> ActiveControllers = new Dictionary<string, GenericUnityController>();
+        protected static readonly Dictionary<string, GenericJoystickController> ActiveControllers = new Dictionary<string, GenericJoystickController>();
 
         private float deviceRefreshTimer;
         private string[] lastDeviceList;
@@ -119,7 +119,7 @@ private void RefreshDevices()
         /// </summary>
         /// <param name="joystickName">The name of they joystick from Unity's <see cref="Input.GetJoystickNames"/></param>
         /// <returns>A new controller reference.</returns>
-        protected virtual GenericUnityController GetOrAddController(string joystickName)
+        protected virtual GenericJoystickController GetOrAddController(string joystickName)
         {
             if (ActiveControllers.ContainsKey(joystickName))
             {
@@ -135,15 +135,15 @@ protected virtual GenericUnityController GetOrAddController(string joystickName)
                 default:
                     return null;
                 case SupportedControllerType.GenericUnity:
-                    controllerType = typeof(GenericUnityController);
+                    controllerType = typeof(GenericJoystickController);
                     break;
                 case SupportedControllerType.Xbox:
                     controllerType = typeof(XboxController);
                     break;
             }
 
             var inputSource = InputSystem?.RequestNewGenericInputSource($"{controllerType.Name} Controller");
-            var detectedController = Activator.CreateInstance(controllerType, TrackingState.NotTracked, Handedness.None, inputSource, null) as GenericUnityController;
+            var detectedController = Activator.CreateInstance(controllerType, TrackingState.NotTracked, Handedness.None, inputSource, null) as GenericJoystickController;
 
             if (detectedController == null)
             {
diff --git a/Assets/MixedRealityToolkit/_Core/Devices/UnityInput/UnityJoystickManager.cs.meta b/Assets/MixedRealityToolkit/_Core/Devices/UnityInput/UnityJoystickManager.cs.meta
diff --git a/Assets/MixedRealityToolkit/_Core/Devices/UnityInput/XboxController.cs b/Assets/MixedRealityToolkit/_Core/Devices/UnityInput/XboxController.cs
@@ -11,7 +11,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Devices.UnityInput
     /// <summary>
     /// Xbox Controller using Unity Input System
     /// </summary>
-    public class XboxController : GenericUnityController
+    public class XboxController : GenericJoystickController
     {
         /// <summary>
         /// Constructor.
diff --git a/Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityControllerMappingProfileInspector.cs b/Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityControllerMappingProfileInspector.cs
@@ -196,7 +196,7 @@ private void RenderControllerProfilesList(SerializedProperty controllerList, boo
                 useCustomInteractionMappings.boolValue = true;
                 mixedRealityControllerInteractions.ClearArray();
                 serializedObject.ApplyModifiedProperties();
-                thisProfile.MixedRealityControllerMappingProfiles[controllerList.arraySize - 1].ControllerType.Type = typeof(GenericUnityController);
+                thisProfile.MixedRealityControllerMappingProfiles[controllerList.arraySize - 1].ControllerType.Type = typeof(GenericJoystickController);
                 return;
             }
 
@@ -243,7 +243,7 @@ private void RenderControllerProfilesList(SerializedProperty controllerList, boo
                 {
                     supportedControllerType = SupportedControllerType.GenericOpenVR;
                 }
-                else if (controllerType == typeof(GenericUnityController))
+                else if (controllerType == typeof(GenericJoystickController))
                 {
                     supportedControllerType = SupportedControllerType.GenericUnity;
                 }
@@ -307,7 +307,7 @@ private void RenderControllerProfilesList(SerializedProperty controllerList, boo
 
                     int currentGenericType = -1;
 
-                    if (controllerType == typeof(GenericUnityController))
+                    if (controllerType == typeof(GenericJoystickController))
                     {
                         currentGenericType = 0;
                     }
@@ -321,7 +321,7 @@ private void RenderControllerProfilesList(SerializedProperty controllerList, boo
 
                     currentGenericType = EditorGUILayout.IntPopup(GenericTypeContent, currentGenericType, GenericTypeListContent, GenericTypeIds);
 
-                    if (controllerType != typeof(GenericUnityController))
+                    if (controllerType != typeof(GenericJoystickController))
                     {
                         EditorGUILayout.PropertyField(controllerHandedness);
                     }
@@ -331,7 +331,7 @@ private void RenderControllerProfilesList(SerializedProperty controllerList, boo
                         switch (currentGenericType)
                         {
                             case 0:
-                                controllerType = typeof(GenericUnityController);
+                                controllerType = typeof(GenericJoystickController);
                                 controllerHandedness.intValue = 0;
                                 break;
                             case 1:
diff --git a/Assets/MixedRealityToolkit/_Core/Managers/MixedRealityManager.cs b/Assets/MixedRealityToolkit/_Core/Managers/MixedRealityManager.cs
@@ -949,7 +949,7 @@ private void AddManagersForTheCurrentPlatform()
                 case RuntimePlatform.WindowsEditor:
                 case RuntimePlatform.OSXPlayer:
                 case RuntimePlatform.OSXEditor:
-                    AddManager(typeof(IMixedRealityDeviceManager), new UnityDeviceManager("Unity Device Manager", 10));
+                    AddManager(typeof(IMixedRealityDeviceManager), new UnityJoystickManager("Unity Joystick Manager", 10));
                     AddManager(typeof(IMixedRealityDeviceManager), new OpenVRDeviceManager("Unity OpenVR Device Manager", 10));
                     break;
                 case RuntimePlatform.IPhonePlayer:
@@ -975,7 +975,7 @@ private void AddManagersForTheCurrentPlatformEditor()
                 case UnityEditor.BuildTarget.StandaloneWindows:
                 case UnityEditor.BuildTarget.StandaloneWindows64:
                 case UnityEditor.BuildTarget.StandaloneOSX:
-                    AddManager(typeof(IMixedRealityDeviceManager), new UnityDeviceManager("Unity Device Manager", 10));
+                    AddManager(typeof(IMixedRealityDeviceManager), new UnityJoystickManager("Unity Joystick Manager", 10));
                     AddManager(typeof(IMixedRealityDeviceManager), new OpenVRDeviceManager("Unity OpenVR Device Manager", 10));
                     break;
                 case UnityEditor.BuildTarget.iOS:

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`
`13`	`13`	`namespace Microsoft.MixedReality.Toolkit.Core.Devices.OpenVR`
`14`	`14`	`{`
`15`		`- public class GenericOpenVRController : GenericUnityController`
	`15`	`+ public class GenericOpenVRController : GenericJoystickController`
`16`	`16`	`{`
`17`	`17`	`public GenericOpenVRController(TrackingState trackingState, Handedness controllerHandedness, IMixedRealityInputSource inputSource = null, MixedRealityInteractionMapping[] interactions = null)`
`18`	`18`	`: base(trackingState, controllerHandedness, inputSource, interactions)`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,9 @@`
`8`	`8`
`9`	`9`	`namespace Microsoft.MixedReality.Toolkit.Core.Devices.UnityInput`
`10`	`10`	`{`
`11`		`- public class GenericUnityController : BaseController`
	`11`	`+ public class GenericJoystickController : BaseController`
`12`	`12`	`{`
`13`		`- public GenericUnityController(TrackingState trackingState, Handedness controllerHandedness, IMixedRealityInputSource inputSource = null, MixedRealityInteractionMapping[] interactions = null)`
	`13`	`+ public GenericJoystickController(TrackingState trackingState, Handedness controllerHandedness, IMixedRealityInputSource inputSource = null, MixedRealityInteractionMapping[] interactions = null)`
`14`	`14`	`: base(trackingState, controllerHandedness, inputSource, interactions)`
`15`	`15`	`{`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Devices.UnityInput`
`11`	`11`	`/// <summary>`
`12`	`12`	`/// Xbox Controller using Unity Input System`
`13`	`13`	`/// </summary>`
`14`		`- public class XboxController : GenericUnityController`
	`14`	`+ public class XboxController : GenericJoystickController`
`15`	`15`	`{`
`16`	`16`	`/// <summary>`
`17`	`17`	`/// Constructor.`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ private void RenderControllerProfilesList(SerializedProperty controllerList, boo`
`196`	`196`	`useCustomInteractionMappings.boolValue = true;`
`197`	`197`	`mixedRealityControllerInteractions.ClearArray();`
`198`	`198`	`serializedObject.ApplyModifiedProperties();`
`199`		`- thisProfile.MixedRealityControllerMappingProfiles[controllerList.arraySize - 1].ControllerType.Type = typeof(GenericUnityController);`
	`199`	`+ thisProfile.MixedRealityControllerMappingProfiles[controllerList.arraySize - 1].ControllerType.Type = typeof(GenericJoystickController);`
`200`	`200`	`return;`
`201`	`201`	`}`
`202`	`202`
`@@ -243,7 +243,7 @@ private void RenderControllerProfilesList(SerializedProperty controllerList, boo`
`243`	`243`	`{`
`244`	`244`	`supportedControllerType = SupportedControllerType.GenericOpenVR;`
`245`	`245`	`}`
`246`		`- else if (controllerType == typeof(GenericUnityController))`
	`246`	`+ else if (controllerType == typeof(GenericJoystickController))`
`247`	`247`	`{`
`248`	`248`	`supportedControllerType = SupportedControllerType.GenericUnity;`
`249`	`249`	`}`
`@@ -307,7 +307,7 @@ private void RenderControllerProfilesList(SerializedProperty controllerList, boo`
`307`	`307`
`308`	`308`	`int currentGenericType = -1;`
`309`	`309`
`310`		`- if (controllerType == typeof(GenericUnityController))`
	`310`	`+ if (controllerType == typeof(GenericJoystickController))`
`311`	`311`	`{`
`312`	`312`	`currentGenericType = 0;`
`313`	`313`	`}`
`@@ -321,7 +321,7 @@ private void RenderControllerProfilesList(SerializedProperty controllerList, boo`
`321`	`321`
`322`	`322`	`currentGenericType = EditorGUILayout.IntPopup(GenericTypeContent, currentGenericType, GenericTypeListContent, GenericTypeIds);`
`323`	`323`
`324`		`- if (controllerType != typeof(GenericUnityController))`
	`324`	`+ if (controllerType != typeof(GenericJoystickController))`
`325`	`325`	`{`
`326`	`326`	`EditorGUILayout.PropertyField(controllerHandedness);`
`327`	`327`	`}`
`@@ -331,7 +331,7 @@ private void RenderControllerProfilesList(SerializedProperty controllerList, boo`
`331`	`331`	`switch (currentGenericType)`
`332`	`332`	`{`
`333`	`333`	`case 0:`
`334`		`- controllerType = typeof(GenericUnityController);`
	`334`	`+ controllerType = typeof(GenericJoystickController);`
`335`	`335`	`controllerHandedness.intValue = 0;`
`336`	`336`	`break;`
`337`	`337`	`case 1:`