Remove workaround to match Vive profile id with the one returned by C…

…hrome. Chrome is now reporting the id matching the official WebXR profile (fix aframevr#4846)
AveryPalmer · Apr 12, 2021 · f6b3de9 · f6b3de9
1 parent 3eaecf3
commit f6b3de9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/components/hand-controls.js b/src/components/hand-controls.js
@@ -415,6 +415,6 @@ function isViveController (trackedControls) {
  var isVive = controller && (controller.id && controller.id.indexOf('OpenVR ') === 0 ||
  (controller.profiles &&
  controller.profiles[0] &&
- controller.profiles[0] === 'htc-vive-controller-mv'));
+ controller.profiles[0] === 'htc-vive'));
  return isVive;
 }
diff --git a/src/components/vive-controls.js b/src/components/vive-controls.js
@@ -11,7 +11,7 @@ var VIVE_CONTROLLER_MODEL_OBJ_MTL = 'https://cdn.aframe.io/controllers/vive/vr_c
 
 var isWebXRAvailable = require('../utils/').device.isWebXRAvailable;
 
-var GAMEPAD_ID_WEBXR = 'htc-vive-controller-mv';
+var GAMEPAD_ID_WEBXR = 'htc-vive';
 var GAMEPAD_ID_WEBVR = 'OpenVR ';
 
 // Prefix for Gen1 and Gen2 Oculus Touch Controllers.