Update references to SupportedControllerType.None

keveleigh · keveleigh · commit 2d017518e950 · 2019-04-01T03:50:48.000-07:00
diff --git a/Assets/MixedRealityToolkit.Providers/OpenVR/OpenVRDeviceManager.cs b/Assets/MixedRealityToolkit.Providers/OpenVR/OpenVRDeviceManager.cs
@@ -118,7 +118,7 @@ protected override SupportedControllerType GetCurrentControllerType(string joyst
         {
             if (string.IsNullOrEmpty(joystickName) || !joystickName.Contains("OpenVR"))
             {
-                return SupportedControllerType.None;
+                return 0;
             }
 
             if (joystickName.Contains("Oculus Rift CV1"))
diff --git a/Assets/MixedRealityToolkit/Definitions/Devices/MixedRealityControllerMapping.cs b/Assets/MixedRealityToolkit/Definitions/Devices/MixedRealityControllerMapping.cs
@@ -82,7 +82,7 @@ public SupportedControllerType SupportedControllerType
                         return attr.SupportedControllerType;
                     }
                 }
-                return SupportedControllerType.None;
+                return 0;
             }
         }
 
diff --git a/Assets/MixedRealityToolkit/Inspectors/ControllerPopupWindow.cs b/Assets/MixedRealityToolkit/Inspectors/ControllerPopupWindow.cs
@@ -210,7 +210,7 @@ public static void Show(MixedRealityControllerMapping controllerMapping, Seriali
                     {
                         new ControllerInputActionOption
                         {
-                            Controller = SupportedControllerType.None,
+                            Controller = 0,
                             Handedness = Handedness.None,
                             InputLabelPositions = new[] {new Vector2(0, 0)},
                             IsLabelFlipped = new []{false}
@@ -352,11 +352,11 @@ private void RenderInteractionList(SerializedProperty interactionList, bool useC
                             controllerInputActionOptions.Controllers.Add(currentControllerOption);
                             isMouseInRects = new bool[currentInteractionList.arraySize];
 
-                            if (controllerInputActionOptions.Controllers.Any(option => option.Controller == SupportedControllerType.None))
+                            if (controllerInputActionOptions.Controllers.Any(option => option.Controller == 0))
                             {
                                 controllerInputActionOptions.Controllers.Remove(
                                     controllerInputActionOptions.Controllers.Find(option =>
-                                        option.Controller == SupportedControllerType.None));
+                                        option.Controller == 0));
                             }
 
                             File.WriteAllText($"{Application.dataPath}{EditorWindowOptionsPath}", JsonUtility.ToJson(controllerInputActionOptions));
diff --git a/Assets/MixedRealityToolkit/Providers/UnityInput/UnityJoystickManager.cs b/Assets/MixedRealityToolkit/Providers/UnityInput/UnityJoystickManager.cs
@@ -180,7 +180,7 @@ protected virtual SupportedControllerType GetCurrentControllerType(string joysti
                 joystickName.Contains("OpenVR") ||
                 joystickName.Contains("Spatial"))
             {
-                return SupportedControllerType.None;
+                return 0;
             }
 
             if (joystickName.StartsWith("Xbox"))

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ protected override SupportedControllerType GetCurrentControllerType(string joyst`
`118`	`118`	`{`
`119`	`119`	`if (string.IsNullOrEmpty(joystickName) \|\| !joystickName.Contains("OpenVR"))`
`120`	`120`	`{`
`121`		`- return SupportedControllerType.None;`
	`121`	`+ return 0;`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`if (joystickName.Contains("Oculus Rift CV1"))`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public SupportedControllerType SupportedControllerType`
`82`	`82`	`return attr.SupportedControllerType;`
`83`	`83`	`}`
`84`	`84`	`}`
`85`		`- return SupportedControllerType.None;`
	`85`	`+ return 0;`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ public static void Show(MixedRealityControllerMapping controllerMapping, Seriali`
`210`	`210`	`{`
`211`	`211`	`new ControllerInputActionOption`
`212`	`212`	`{`
`213`		`- Controller = SupportedControllerType.None,`
	`213`	`+ Controller = 0,`
`214`	`214`	`Handedness = Handedness.None,`
`215`	`215`	`InputLabelPositions = new[] {new Vector2(0, 0)},`
`216`	`216`	`IsLabelFlipped = new []{false}`
`@@ -352,11 +352,11 @@ private void RenderInteractionList(SerializedProperty interactionList, bool useC`
`352`	`352`	`controllerInputActionOptions.Controllers.Add(currentControllerOption);`
`353`	`353`	`isMouseInRects = new bool[currentInteractionList.arraySize];`
`354`	`354`
`355`		`- if (controllerInputActionOptions.Controllers.Any(option => option.Controller == SupportedControllerType.None))`
	`355`	`+ if (controllerInputActionOptions.Controllers.Any(option => option.Controller == 0))`
`356`	`356`	`{`
`357`	`357`	`controllerInputActionOptions.Controllers.Remove(`
`358`	`358`	`controllerInputActionOptions.Controllers.Find(option =>`
`359`		`- option.Controller == SupportedControllerType.None));`
	`359`	`+ option.Controller == 0));`
`360`	`360`	`}`
`361`	`361`
`362`	`362`	`File.WriteAllText($"{Application.dataPath}{EditorWindowOptionsPath}", JsonUtility.ToJson(controllerInputActionOptions));`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ protected virtual SupportedControllerType GetCurrentControllerType(string joysti`
`180`	`180`	`joystickName.Contains("OpenVR") \|\|`
`181`	`181`	`joystickName.Contains("Spatial"))`
`182`	`182`	`{`
`183`		`- return SupportedControllerType.None;`
	`183`	`+ return 0;`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`if (joystickName.StartsWith("Xbox"))`