allow multiple ID prefixes with pipe delimiter; support GearVR, Gear …

…VR and Oculus Go with gearvr-controls
aframevr · Mar 9, 2018 · e399875 · e399875
1 parent 51354f1
commit e399875
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/components/gearvr-controls.js b/src/components/gearvr-controls.js
@@ -9,7 +9,7 @@ var GEARVR_CONTROLLER_MODEL_BASE_URL = 'https://cdn.aframe.io/controllers/samsun
 var GEARVR_CONTROLLER_MODEL_OBJ_URL = GEARVR_CONTROLLER_MODEL_BASE_URL + 'gear_vr_controller.obj';
 var GEARVR_CONTROLLER_MODEL_OBJ_MTL = GEARVR_CONTROLLER_MODEL_BASE_URL + 'gear_vr_controller.mtl';
 
-var GAMEPAD_ID_PREFIX = 'Gear VR';
+var GAMEPAD_ID_PREFIX = 'Gear VR|GearVR|Oculus Go';
 
 /**
  * Gear VR controls.

diff --git a/src/utils/tracked-controls.js b/src/utils/tracked-controls.js
@@ -88,10 +88,20 @@ function findMatchingController (controllers, filterIdExact, filterIdPrefix, fil
   var i;
   var matchingControllerOccurence = 0;
   var targetControllerMatch = filterControllerIndex || 0;
-
+  var filterIdPrefixes;
+  if (filterIdPrefix && filterIdPrefix.indexOf('|') >= 0) {
+    filterIdPrefixes = filterIdPrefix.split('|');
+  }
   for (i = 0; i < controllers.length; i++) {
     controller = controllers[i];
     // Determine if the controller ID matches our criteria
+    if (filterIdPrefixes) {
+      var matches = false;
+      for (var prefix in filterIdPrefixes) {
+        if (prefix && controller.id.indexOf(prefix) === -1) { matches = true; }
+      }
+      if (!matches) { continue; }
+    } else
     if (filterIdPrefix && controller.id.indexOf(filterIdPrefix) === -1) { continue; }
     if (!filterIdPrefix && controller.id !== filterIdExact) { continue; }