Skip to content

Commit caac652

Browse files
SimonDarksideJSimonDarksideJ
committed
I feel dirty.
All controller input maps done and tested. Need to retest with other active SDK's
1 parent a789efd commit caac652

File tree

4 files changed

+291
-69
lines changed

4 files changed

+291
-69
lines changed

‎Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityControllerConfigurationProfile.asset‎

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,62 @@ MonoBehaviour:
113113
id: 0
114114
description: None
115115
axisConstraint: 0
116+
- id: 0
117+
axisType: 2
118+
inputType: 17
119+
inputAction:
120+
id: 0
121+
description: None
122+
axisConstraint: 0
123+
- id: 0
124+
axisType: 3
125+
inputType: 17
126+
inputAction:
127+
id: 0
128+
description: None
129+
axisConstraint: 0
130+
- id: 0
131+
axisType: 3
132+
inputType: 10
133+
inputAction:
134+
id: 0
135+
description: None
136+
axisConstraint: 0
137+
- id: 0
138+
axisType: 4
139+
inputType: 24
140+
inputAction:
141+
id: 0
142+
description: None
143+
axisConstraint: 0
144+
- id: 0
145+
axisType: 2
146+
inputType: 25
147+
inputAction:
148+
id: 0
149+
description: None
150+
axisConstraint: 0
151+
- id: 0
152+
axisType: 2
153+
inputType: 27
154+
inputAction:
155+
id: 0
156+
description: None
157+
axisConstraint: 0
158+
- id: 0
159+
axisType: 4
160+
inputType: 20
161+
inputAction:
162+
id: 0
163+
description: None
164+
axisConstraint: 0
165+
- id: 0
166+
axisType: 2
167+
inputType: 21
168+
inputAction:
169+
id: 0
170+
description: None
171+
axisConstraint: 0
116172
- id: 4
117173
description: OpenVR Controller Right
118174
controller:
@@ -150,3 +206,59 @@ MonoBehaviour:
150206
id: 0
151207
description: None
152208
axisConstraint: 0
209+
- id: 0
210+
axisType: 2
211+
inputType: 17
212+
inputAction:
213+
id: 0
214+
description: None
215+
axisConstraint: 0
216+
- id: 0
217+
axisType: 3
218+
inputType: 17
219+
inputAction:
220+
id: 0
221+
description: None
222+
axisConstraint: 0
223+
- id: 0
224+
axisType: 3
225+
inputType: 10
226+
inputAction:
227+
id: 0
228+
description: None
229+
axisConstraint: 0
230+
- id: 0
231+
axisType: 4
232+
inputType: 24
233+
inputAction:
234+
id: 0
235+
description: None
236+
axisConstraint: 0
237+
- id: 0
238+
axisType: 2
239+
inputType: 25
240+
inputAction:
241+
id: 0
242+
description: None
243+
axisConstraint: 0
244+
- id: 0
245+
axisType: 2
246+
inputType: 27
247+
inputAction:
248+
id: 0
249+
description: None
250+
axisConstraint: 0
251+
- id: 0
252+
axisType: 4
253+
inputType: 20
254+
inputAction:
255+
id: 0
256+
description: None
257+
axisConstraint: 0
258+
- id: 0
259+
axisType: 2
260+
inputType: 21
261+
inputAction:
262+
id: 0
263+
description: None
264+
axisConstraint: 0

‎Assets/MixedRealityToolkit-Tests/UnityInputManagerHelperTests.cs‎

Lines changed: 32 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,26 @@ public void Test03_TestAddCustomMappings()
4545

4646
InputMappingAxisUtility.InputManagerAxis[] OpenVRControllerAxisMappings =
4747
{
48-
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_TOUCHPAD_LEFT_CONTROLLER", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 1 },
49-
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_TOUCHPAD_RIGHT_CONTROLLER", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 2 }
48+
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_TOUCHPAD_LEFT_CONTROLLER_HORIZONTAL", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 1 },
49+
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_TOUCHPAD_LEFT_CONTROLLER_VERTICAL", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 2 },
50+
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_TOUCHPAD_RIGHT_CONTROLLER_HORIZONTAL", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 4 },
51+
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_TOUCHPAD_RIGHT_CONTROLLER_VERTICAL", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 5 },
52+
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_TRIGGER_LEFT_CONTROLLER", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 9 },
53+
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_TRIGGER_RIGHT_CONTROLLER", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 10 },
54+
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_GRIP_LEFT_CONTROLLER", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 11 },
55+
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_GRIP_RIGHT_CONTROLLER", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 12 }
5056
};
5157

5258
InputMappingAxisUtility.ApplyMappings(OpenVRControllerAxisMappings);
5359

54-
55-
Assert.IsTrue(InputMappingAxisUtility.DoesAxisNameExist("OPENVR_TOUCHPAD_LEFT_CONTROLLER"));
56-
Assert.IsTrue(InputMappingAxisUtility.DoesAxisNameExist("OPENVR_TOUCHPAD_RIGHT_CONTROLLER"));
57-
60+
Assert.IsTrue(InputMappingAxisUtility.DoesAxisNameExist("OPENVR_TOUCHPAD_LEFT_CONTROLLER_HORIZONTAL"));
61+
Assert.IsTrue(InputMappingAxisUtility.DoesAxisNameExist("OPENVR_TOUCHPAD_LEFT_CONTROLLER_VERTICAL"));
62+
Assert.IsTrue(InputMappingAxisUtility.DoesAxisNameExist("OPENVR_TOUCHPAD_RIGHT_CONTROLLER_HORIZONTAL"));
63+
Assert.IsTrue(InputMappingAxisUtility.DoesAxisNameExist("OPENVR_TOUCHPAD_RIGHT_CONTROLLER_VERTICAL"));
64+
Assert.IsTrue(InputMappingAxisUtility.DoesAxisNameExist("OPENVR_TRIGGER_LEFT_CONTROLLER"));
65+
Assert.IsTrue(InputMappingAxisUtility.DoesAxisNameExist("OPENVR_TRIGGER_RIGHT_CONTROLLER"));
66+
Assert.IsTrue(InputMappingAxisUtility.DoesAxisNameExist("OPENVR_GRIP_LEFT_CONTROLLER"));
67+
Assert.IsTrue(InputMappingAxisUtility.DoesAxisNameExist("OPENVR_GRIP_RIGHT_CONTROLLER"));
5868
}
5969

6070
[Test]
@@ -65,15 +75,26 @@ public void Test04_TestRemoveCustomMappings()
6575

6676
InputMappingAxisUtility.InputManagerAxis[] OpenVRControllerAxisMappings =
6777
{
68-
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_TOUCHPAD_LEFT_CONTROLLER", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 1 },
69-
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_TOUCHPAD_RIGHT_CONTROLLER", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 2 }
78+
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_TOUCHPAD_LEFT_CONTROLLER_HORIZONTAL", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 1 },
79+
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_TOUCHPAD_LEFT_CONTROLLER_VERTICAL", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 2 },
80+
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_TOUCHPAD_RIGHT_CONTROLLER_HORIZONTAL", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 4 },
81+
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_TOUCHPAD_RIGHT_CONTROLLER_VERTICAL", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 5 },
82+
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_TRIGGER_LEFT_CONTROLLER", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 9 },
83+
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_TRIGGER_RIGHT_CONTROLLER", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 10 },
84+
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_GRIP_LEFT_CONTROLLER", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 11 },
85+
new InputMappingAxisUtility.InputManagerAxis() { Name = "OPENVR_GRIP_RIGHT_CONTROLLER", Dead = 0.001f, Sensitivity = 1, Invert = false, Type = InputMappingAxisUtility.MappingAxisType.JoystickAxis, Axis = 12 }
7086
};
7187

7288
InputMappingAxisUtility.RemoveMappings(OpenVRControllerAxisMappings);
7389

74-
Assert.IsFalse(InputMappingAxisUtility.DoesAxisNameExist("OPENVR_TOUCHPAD_LEFT_CONTROLLER"));
75-
Assert.IsFalse(InputMappingAxisUtility.DoesAxisNameExist("OPENVR_TOUCHPAD_RIGHT_CONTROLLER"));
76-
90+
Assert.IsFalse(InputMappingAxisUtility.DoesAxisNameExist("OPENVR_TOUCHPAD_LEFT_CONTROLLER_HORIZONTAL"));
91+
Assert.IsFalse(InputMappingAxisUtility.DoesAxisNameExist("OPENVR_TOUCHPAD_LEFT_CONTROLLER_VERTICAL"));
92+
Assert.IsFalse(InputMappingAxisUtility.DoesAxisNameExist("OPENVR_TOUCHPAD_RIGHT_CONTROLLER_HORIZONTAL"));
93+
Assert.IsFalse(InputMappingAxisUtility.DoesAxisNameExist("OPENVR_TOUCHPAD_RIGHT_CONTROLLER_VERTICAL"));
94+
Assert.IsFalse(InputMappingAxisUtility.DoesAxisNameExist("OPENVR_TRIGGER_LEFT_CONTROLLER"));
95+
Assert.IsFalse(InputMappingAxisUtility.DoesAxisNameExist("OPENVR_TRIGGER_RIGHT_CONTROLLER"));
96+
Assert.IsFalse(InputMappingAxisUtility.DoesAxisNameExist("OPENVR_GRIP_LEFT_CONTROLLER"));
97+
Assert.IsFalse(InputMappingAxisUtility.DoesAxisNameExist("OPENVR_GRIP_RIGHT_CONTROLLER"));
7798
}
7899
}
79100
}

0 commit comments

Comments
 (0)