Browse Source

*Controller: Check navigator.getGamepads before calling it. See #11719

Mr.doob 8 years ago
parent
commit
22de20807e
2 changed files with 4 additions and 3 deletions
  1. 3 2
      examples/js/vr/DaydreamController.js
  2. 1 1
      examples/js/vr/ViveController.js

+ 3 - 2
examples/js/vr/DaydreamController.js

@@ -17,9 +17,10 @@ THREE.DaydreamController = function () {
 
 	function findGamepad() {
 
-		// iterate across gamepads as the Daydream Controller may not be in position 0
+		// iterate across gamepads as the Daydream Controller may not be
+		// in position 0
 
-		var gamepads = navigator.getGamepads();
+		var gamepads = navigator.getGamepads && navigator.getGamepads();
 
 		for ( var i = 0; i < 4; i ++ ) {
 

+ 1 - 1
examples/js/vr/ViveController.js

@@ -21,7 +21,7 @@ THREE.ViveController = function ( id ) {
 		// Iterate across gamepads as Vive Controllers may not be
 		// in position 0 and 1.
 
-		var gamepads = navigator.getGamepads();
+		var gamepads = navigator.getGamepads && navigator.getGamepads();
 
 		for ( var i = 0, j = 0; i < 4; i ++ ) {