Added Xbox S Bluetooth controller support. #936

StephenHodgson · 2017-09-06T00:56:05Z

Fixes Gamepad Controller Example and scripts need to be updated #362
Properly supports Xbox controller via Input Manager. (includes bt Xbox S support.)
Downloads the InputManger.asset file from GitHub and stores the old one.
Reorganized folders and scripts to better reflect 2017.2 folder structure in input folder.
See updated Input documentation preview here

TODO:

~~Add documentation.~~
~~Nicelooking test scene.~~
~~Figure out an easy way for people to copy InputManger.asset into their own projects.~~
~~Test Xbox Platform builds.~~

Zod- · 2017-09-06T08:24:12Z

Assets/HoloToolkit/Input/Scripts/InputEventData/GamePadEventData.cs

@@ -0,0 +1,17 @@
+using UnityEngine.EventSystems;


License header missing

Zod- · 2017-09-06T08:47:41Z

Assets/HoloToolkit/Input/Scripts/GameControllerManipulator.cs

@@ -10,6 +11,7 @@ namespace HoloToolkit.Unity.InputModule
    /// TODO This should be converted to an input source.
    /// </summary>
    /// <remarks>Make sure to enable the HumanInterfaceDevice capability before using.</remarks>
+    [Obsolete]


Mention obsolete in favor of what. Could remove the TODO then aswell if you mention the input source here.

Zod- · 2017-09-08T16:36:36Z

Assets/HoloToolkit/Input/Scripts/InputSources/XboxControllerInputSource.cs

+            {
+                if (string.IsNullOrEmpty(joystickNames[i]) || gamePadInputDatas.ContainsKey((uint)i)) { continue; }
+
+                if (joystickNames[i].Contains("Xbox Bluetooth Gamepad") || joystickNames[i].Contains("Xbox Wireless Controller") || joystickNames[i].Contains("Xbox Controller"))


Are there gonna be more of these names? Maybe have a fixed list of these so this line doesn't get any longer.

Not exactly a fixed list from Unity side.

The joystick list gets changed every time a new one is recognized by either the player or the editor.

I mean a fixed list for the contains names

…ething you shouldn't have)

Added rotation example.

jessemcculloch · 2017-09-09T19:39:42Z

When testing this, all the buttons work (Bumpers, ABXY, Select, Menu, Stick Click. But none of the Axis ones seem to be working (Triggers, sticks horz & vert, DPAD, etc)

I did grab the input settings from the repro, so that's not the issue.

StephenHodgson · 2017-09-09T19:41:33Z

Screen shot the input settings?

StephenHodgson · 2017-09-09T19:48:04Z

Also what kind of xbox controller are you using?

StephenHodgson · 2017-09-09T19:59:02Z

@jessemcculloch did you test this in the toolkit project or in your own?

jessemcculloch · 2017-09-09T23:05:09Z

Tested it in the Toolkit, Using the XboxControllerExample scene.
Controller is the Xbox One S controller, so straight Bluetooth, no dongle.

jessemcculloch · 2017-09-09T23:07:12Z

Also, this was in the player, not on device. Not sure if that matters

StephenHodgson · 2017-09-16T16:30:34Z

@jessemcculloch I think I might have an idea about what's going on.

Initially I had gotten the input from any joystick, but found when I made a build for WSA PC that the axis inputs were stuck at either 1 or -1 depending on if the axis was inverted. Come to find out the scroll and mouse was also influencing the left and shared trigger axis'. So I changed it to only get joystick axis inputs from joystick 1. Try changing the input to get input from any joystick and see if that works for you.

jessemcculloch · 2017-09-16T19:30:09Z

That was exactly it @StephenHodgson

StephenHodgson · 2017-09-16T19:37:57Z

@jessemcculloch Yeah I'm unsure how to go about getting joystick input from all the axis without getting mouse and scroll axis inputs that influence our controller.

Unfortunately the joystick axis for the left stick and the shared triggers need to be x, y, and scroll respectively to work.

The only other thing we could do is write our own input module, but I'm trying to avoid that.

jessemcculloch · 2017-09-16T19:44:52Z

Assets/HoloToolkit/Input/Scripts/GameControllerManipulator.cs

    /// </summary>
    /// <remarks>Make sure to enable the HumanInterfaceDevice capability before using.</remarks>
+    [Obsolete]
    public class GameControllerManipulator : MonoBehaviour


Should we have a message letting people know what they should be using instead of this Obsolete class, or is this just used internally?

It was never really working anyway, but I think it's good practice to add the message.

StephenHodgson · 2017-09-16T20:07:46Z

Yeah I'm unsure how to go about getting joystick input from all the axis without getting mouse and scroll axis inputs that influence our controller.

After switching back to getting all joystick axis inputs, this no longer seemed to happen.

~~Not sure what changed but I'll revert back to getting input from all joysticks.~~

[Edit]
I figured out what happened. So for the HoloLens build, you definitely need to enable the HID capability but for the PC & Xbox build if you enable the HID capability you get stuck axis'. I might write in a switch for the PC & Xbox vs the HoloLens builds that enables the capability in the Build and Deploy tools and add remarks in the comments.

… condition. Reverted input mappings to use motion from all joysticks.

StephenHodgson · 2017-09-16T21:02:33Z

@keveleigh, @NeerajW, @cre8ivepark is there any chance MSFT would provide a low poly 3d xbox controller model for the test scene?

Or could we load the controller model via glTF & driver like the motion controllers?

added position and rotation speed modifiers to test scene.

Added a customizable button via enum example.

keveleigh · 2017-09-19T22:29:34Z

Does this replace the GamepadInput script added in the dev branch?

keveleigh · 2017-09-19T22:30:16Z

@StephenHodgson I'm not aware of an Xbox controller model, unfortunately.

StephenHodgson · 2017-09-19T22:39:46Z

Does this replace the GamepadInput script added in the dev branch?

Yes. I'm working on a PR to address this soon.

keveleigh · 2017-09-19T22:31:51Z

Assets/HoloToolkit/Utilities/Scripts/Editor/ProjectSettingsWindow.cs

+                userPermission = EditorUtility.DisplayDialog("Attention!",
+                    "Hi there, we noticed that you've enabled the Xbox Controller support.\n\n" +
+                    "Do you give us permission to download the latest input mapping definitions from " +
+                    "the Mixed Reality Toolkit's GitHub page and replace your project's InputManager.asset?\n\n",


Is there a way to append instead of replace? I'd prefer not to be destructive here.

Not that I'm aware of. This step is optional, and I've kept this flexible where people don't have to use the provided InputManager.asset and map their own.

I'd also rather overwrite so there are not overlapping or conflicting mappings.

keveleigh · 2017-09-19T22:33:34Z

Assets/HoloToolkit/Input/README.md

+##### SpeechEventData.cs
+Event data for an event coming from the speech keyword source.
+
+##### XboxControllerEVentData.cs


nit: typo: EVent

keveleigh · 2017-09-19T22:37:43Z

Assets/HoloToolkit/Input/Scripts/InputHandlers/IGamePadHandler.cs

+{
+    public interface IGamePadHandler : IEventSystemHandler
+    {
+        void OnGamePadDetected(GamePadEventData eventData);


Do you think it's more useful making gamepad input separate events, or to combine them with the motion controller events? They share a set of input axes, and source detected/lost could be handled similarly.

I kept it as a singular event type to reduce complexity. But it will raise separate events for each controller.

I'm already thinking about a plan to make sure sure this plays well with the motion controllers in the dev branch. I'll be sure to request your feedback when I submit.

keveleigh · 2017-09-19T22:39:16Z

Assets/HoloToolkit/Input/Scripts/InputSources/GamePadInputSource.cs

+
+            for (var i = 0; i < joystickNames.Length; i++)
+            {
+                Debug.LogWarningFormat("Joystick \"{0}\" has not been setup with the input manager.Create a new class that inherits from \"GamePadInputSource\" and implement it.", joystickNames[i]);


nit: missing a space between "." and "Create".

Added xbox bluetooth controller support.

57fa91d

msftclas added the cla-already-signed label Sep 6, 2017

removed empty folders

6b1f0e6

Zod- suggested changes Sep 6, 2017

View reviewed changes

Stephen Hodgson added 5 commits September 6, 2017 07:48

CR changes

75920d3

Added button up and down to event data

064811f

lastest updates to fix UWP gamepad enumeration issues.

703427e

Merge branch 'MRTK-Master' into HTK-XboxController

6510e5e

Reverted some breaking changes to speech input source class

e2ae62b

StephenHodgson mentioned this pull request Sep 8, 2017

Mrtk xbox controller port from htk #943

Closed

2 tasks

Zod- mentioned this pull request Sep 8, 2017

Fix for speech cross platform support #935

Merged

Zod- reviewed Sep 8, 2017

View reviewed changes

Stephen Hodgson added 10 commits September 8, 2017 10:22

Made joystick names const

d3af7c3

added ability to customize input axis mappings

df529a6

reverted ImportExportAnchorManager (Thanks resharper for changing som…

23f4086

…ething you shouldn't have)

even better customizability

cfe1922

minor formatting

c5246a4

fixed default input module horizontal axis.

828010f

updated scene serialization.

a41c0ae

Fixed some initialization of the controller mapping.

a52d53f

Added rotation example.

minor tweaks to the editor inspector.

55808de

removed unused using declaration.

937b1d8

Stephen Hodgson added 2 commits September 9, 2017 12:42

Merge branch 'MRTK-Master' into HTK-XboxController

d38f8b8

reverted some changes from the merge

4b68d22

StephenHodgson requested a review from keveleigh September 16, 2017 17:02

Stephen Hodgson added 4 commits September 16, 2017 12:44

Merge branch 'MRTK-master' into HTK-XboxController

885de60

serialized confidence field

1bbdd5e

Added 'Xbox One For Windows' definition

e3d349b

added unimplemented warning to base class.

9e1e52d

jessemcculloch approved these changes Sep 16, 2017

View reviewed changes

Moved global listener assignment to start to prevent InputManger race…

ef1c117

… condition. Reverted input mappings to use motion from all joysticks.

jessemcculloch approved these changes Sep 16, 2017

View reviewed changes

Updated Remarks, and Input name to be similar to usage in code.

d7f0afe

Stephen Hodgson and others added 8 commits September 16, 2017 14:45

better controller detection.

03fd256

added position and rotation speed modifiers to test scene.

Made event data properties private set only.

20e8cae

Added a customizable button via enum example.

renamed folder InputEvents to InputHandlers

0153974

Moved the Xbox data and helper classes out of the InputSources folder

056e9cc

Updated Readme

76736b8

added missing gamepad folder meta data

1e3dca9

Easy input manager settings! Yay!

0e31eb0

removed todo line

065b6fa

StephenHodgson merged commit ac3ef81 into microsoft:master Sep 17, 2017

StephenHodgson deleted the HTK-XboxController branch September 17, 2017 20:54

keveleigh reviewed Sep 19, 2017

View reviewed changes

keveleigh mentioned this pull request Sep 21, 2017

Xbox Controller Updates #994

Merged

keveleigh mentioned this pull request Oct 11, 2017

Need a way to add the Toolkit's InputManager axes to a project without overwriting existing axes #1127

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added Xbox S Bluetooth controller support. #936

Added Xbox S Bluetooth controller support. #936

StephenHodgson commented Sep 6, 2017 •

edited

Zod- Sep 6, 2017

Zod- Sep 6, 2017

Zod- Sep 8, 2017

StephenHodgson Sep 8, 2017

Zod- Sep 8, 2017

StephenHodgson Sep 8, 2017

jessemcculloch commented Sep 9, 2017

StephenHodgson commented Sep 9, 2017

StephenHodgson commented Sep 9, 2017

StephenHodgson commented Sep 9, 2017

jessemcculloch commented Sep 9, 2017

jessemcculloch commented Sep 9, 2017

StephenHodgson commented Sep 16, 2017

jessemcculloch commented Sep 16, 2017

StephenHodgson commented Sep 16, 2017 •

edited

jessemcculloch Sep 16, 2017

StephenHodgson Sep 16, 2017

StephenHodgson commented Sep 16, 2017 •

edited

StephenHodgson commented Sep 16, 2017 •

edited

keveleigh commented Sep 19, 2017

keveleigh commented Sep 19, 2017

StephenHodgson commented Sep 19, 2017 •

edited

keveleigh Sep 19, 2017

StephenHodgson Sep 19, 2017 •

edited

keveleigh Sep 19, 2017

keveleigh Sep 19, 2017

StephenHodgson Sep 19, 2017 •

edited

keveleigh Sep 19, 2017

Added Xbox S Bluetooth controller support. #936

Added Xbox S Bluetooth controller support. #936

Conversation

StephenHodgson commented Sep 6, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jessemcculloch commented Sep 9, 2017

StephenHodgson commented Sep 9, 2017

StephenHodgson commented Sep 9, 2017

StephenHodgson commented Sep 9, 2017

jessemcculloch commented Sep 9, 2017

jessemcculloch commented Sep 9, 2017

StephenHodgson commented Sep 16, 2017

jessemcculloch commented Sep 16, 2017

StephenHodgson commented Sep 16, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

StephenHodgson commented Sep 16, 2017 • edited

StephenHodgson commented Sep 16, 2017 • edited

keveleigh commented Sep 19, 2017

keveleigh commented Sep 19, 2017

StephenHodgson commented Sep 19, 2017 • edited

Choose a reason for hiding this comment

StephenHodgson Sep 19, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

StephenHodgson Sep 19, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

StephenHodgson commented Sep 6, 2017 •

edited

StephenHodgson commented Sep 16, 2017 •

edited

StephenHodgson commented Sep 16, 2017 •

edited

StephenHodgson commented Sep 16, 2017 •

edited

StephenHodgson commented Sep 19, 2017 •

edited

StephenHodgson Sep 19, 2017 •

edited

StephenHodgson Sep 19, 2017 •

edited