Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check for HTC Vive Focus Controller #1247

Merged
merged 1 commit into from
Apr 19, 2019
Merged

Conversation

johnshaughnessy
Copy link
Contributor

Fixes #1245 and #1215

@johnshaughnessy johnshaughnessy merged commit 70c1865 into master Apr 19, 2019
@@ -292,8 +292,7 @@ AFRAME.registerSystem("userinput", {
gamepadDevice = new WindowsMixedRealityControllerDevice(e.gamepad);
} else if (e.gamepad.id === "Oculus Go Controller") {
gamepadDevice = new OculusGoControllerDevice(e.gamepad);
// Note that FXR reports Vive Focus' controller as GearVR, so this is primarily to support that
} else if (e.gamepad.id === "Gear VR Controller") {
} else if (e.gamepad.id === "Gear VR Controller" || e.gamepad.id === "HTC Vive Focus Controller") {
gamepadDevice = new GearVRControllerDevice(e.gamepad);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this handle Focus 6DoF as well?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support HTC Vive Focus Controller
2 participants