Skip to content

Commit 1c3eb91

Browse files
author
David Kline
authored
Merge pull request #2441 from Microsoft/mrtk_development
Merge input fixes from mrtk_development
2 parents 16596be + b3df1f4 commit 1c3eb91

20 files changed

+459
-257
lines changed

‎Assets/MixedRealityToolkit-Tests/MixedRealityToolkit.Tests.asmdef

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"name": "Microsoft.MixedReality.Toolkit.Tests",
33
"references": [
44
"Microsoft.MixedReality.Toolkit",
5-
"Microsoft.MixedReality.Toolkit.InputSystem"
5+
"Microsoft.MixedReality.Toolkit.InputSystem",
6+
"Microsoft.MixedReality.Toolkit.Internal.Build"
67
],
78
"optionalUnityReferences": [
89
"TestAssemblies"

‎Assets/MixedRealityToolkit-Tests/UnityInputManagerHelperTests.cs

+19-18
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License. See LICENSE in the project root for license information.
33

4+
using Microsoft.MixedReality.Toolkit.Internal.Definitions.Utilities;
45
using Microsoft.MixedReality.Toolkit.Internal.Utilities;
56
using NUnit.Framework;
67

@@ -11,16 +12,16 @@ public class UnityInputManagerHelperTests
1112
[Test]
1213
public void Test01_TestAddCustomMappings()
1314
{
14-
InputMappingAxisUtility.InputManagerAxis[] OpenVRControllerAxisMappings =
15+
InputManagerAxis[] OpenVRControllerAxisMappings =
1516
{
16-
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_TOUCHPAD_LEFT_CONTROLLER_HORIZONTAL", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 1 },
17-
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_TOUCHPAD_LEFT_CONTROLLER_VERTICAL", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 2 },
18-
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_TOUCHPAD_RIGHT_CONTROLLER_HORIZONTAL", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 4 },
19-
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_TOUCHPAD_RIGHT_CONTROLLER_VERTICAL", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 5 },
20-
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_TRIGGER_LEFT_CONTROLLER", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 9 },
21-
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_TRIGGER_RIGHT_CONTROLLER", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 10 },
22-
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_GRIP_LEFT_CONTROLLER", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 11 },
23-
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_GRIP_RIGHT_CONTROLLER", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 12 }
17+
new InputManagerAxis() { Name = "OPENVR_TOUCHPAD_LEFT_CONTROLLER_HORIZONTAL", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 1 },
18+
new InputManagerAxis() { Name = "OPENVR_TOUCHPAD_LEFT_CONTROLLER_VERTICAL", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 2 },
19+
new InputManagerAxis() { Name = "OPENVR_TOUCHPAD_RIGHT_CONTROLLER_HORIZONTAL", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 4 },
20+
new InputManagerAxis() { Name = "OPENVR_TOUCHPAD_RIGHT_CONTROLLER_VERTICAL", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 5 },
21+
new InputManagerAxis() { Name = "OPENVR_TRIGGER_LEFT_CONTROLLER", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 9 },
22+
new InputManagerAxis() { Name = "OPENVR_TRIGGER_RIGHT_CONTROLLER", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 10 },
23+
new InputManagerAxis() { Name = "OPENVR_GRIP_LEFT_CONTROLLER", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 11 },
24+
new InputManagerAxis() { Name = "OPENVR_GRIP_RIGHT_CONTROLLER", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 12 }
2425
};
2526

2627
InputMappingAxisUtility.ApplyMappings(OpenVRControllerAxisMappings);
@@ -38,16 +39,16 @@ public void Test01_TestAddCustomMappings()
3839
[Test]
3940
public void Test02_TestRemoveCustomMappings()
4041
{
41-
InputMappingAxisUtility.InputManagerAxis[] OpenVRControllerAxisMappings =
42+
InputManagerAxis[] OpenVRControllerAxisMappings =
4243
{
43-
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_TOUCHPAD_LEFT_CONTROLLER_HORIZONTAL", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 1 },
44-
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_TOUCHPAD_LEFT_CONTROLLER_VERTICAL", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 2 },
45-
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_TOUCHPAD_RIGHT_CONTROLLER_HORIZONTAL", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 4 },
46-
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_TOUCHPAD_RIGHT_CONTROLLER_VERTICAL", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 5 },
47-
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_TRIGGER_LEFT_CONTROLLER", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 9 },
48-
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_TRIGGER_RIGHT_CONTROLLER", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 10 },
49-
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_GRIP_LEFT_CONTROLLER", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 11 },
50-
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_GRIP_RIGHT_CONTROLLER", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 12 }
44+
new InputManagerAxis() { Name = "OPENVR_TOUCHPAD_LEFT_CONTROLLER_HORIZONTAL", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 1 },
45+
new InputManagerAxis() { Name = "OPENVR_TOUCHPAD_LEFT_CONTROLLER_VERTICAL", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 2 },
46+
new InputManagerAxis() { Name = "OPENVR_TOUCHPAD_RIGHT_CONTROLLER_HORIZONTAL", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 4 },
47+
new InputManagerAxis() { Name = "OPENVR_TOUCHPAD_RIGHT_CONTROLLER_VERTICAL", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 5 },
48+
new InputManagerAxis() { Name = "OPENVR_TRIGGER_LEFT_CONTROLLER", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 9 },
49+
new InputManagerAxis() { Name = "OPENVR_TRIGGER_RIGHT_CONTROLLER", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 10 },
50+
new InputManagerAxis() { Name = "OPENVR_GRIP_LEFT_CONTROLLER", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 11 },
51+
new InputManagerAxis() { Name = "OPENVR_GRIP_RIGHT_CONTROLLER", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 12 }
5152
};
5253

5354
InputMappingAxisUtility.RemoveMappings(OpenVRControllerAxisMappings);

‎Assets/MixedRealityToolkit/_Core/Utilities/InputMappingAxisUtility.cs ‎Assets/MixedRealityToolkit/_Core/BuildAndDeploy/InputMappingAxisUtility.cs

+1-37
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License. See LICENSE in the project root for license information.
33

4+
using Microsoft.MixedReality.Toolkit.Internal.Definitions.Utilities;
45
using System.Collections.Generic;
56
using UnityEditor;
6-
using UnityEngine;
77

88
namespace Microsoft.MixedReality.Toolkit.Internal.Utilities
99
{
@@ -15,42 +15,6 @@ namespace Microsoft.MixedReality.Toolkit.Internal.Utilities
1515
/// </remarks>
1616
public static class InputMappingAxisUtility
1717
{
18-
#region Nested Types
19-
20-
/// <summary>
21-
/// Used to map AxisType from a useful name to the int value the InputManager wants.
22-
/// </summary>
23-
public enum MappingAxisType
24-
{
25-
KeyOrMouseButton = 0,
26-
MouseMovement,
27-
JoystickAxis
28-
};
29-
30-
/// <summary>
31-
/// Used to define an entire InputManagerAxis, with each variable defined by the same term the Inspector shows.
32-
/// </summary>
33-
public class InputManagerAxis
34-
{
35-
public string Name = string.Empty;
36-
public string DescriptiveName = string.Empty;
37-
public string DescriptiveNegativeName = string.Empty;
38-
public string NegativeButton = string.Empty;
39-
public string PositiveButton = string.Empty;
40-
public string AltNegativeButton = string.Empty;
41-
public string AltPositiveButton = string.Empty;
42-
public float Gravity = 0.0f;
43-
public float Dead = 0.0f;
44-
public float Sensitivity = 0.0f;
45-
public bool Snap = false;
46-
public bool Invert = false;
47-
public MappingAxisType Type = default(MappingAxisType);
48-
public int Axis = 0;
49-
public int JoyNum = 0;
50-
}
51-
52-
#endregion Nested Types
53-
5418
#region Configuration elements
5519

5620
/// <summary>

‎Assets/MixedRealityToolkit/_Core/Utilities/InputMappingAxisUtility.cs.meta ‎Assets/MixedRealityToolkit/_Core/BuildAndDeploy/InputMappingAxisUtility.cs.meta

File renamed without changes.

0 commit comments

Comments
 (0)