Forráskód Böngészése

Merge pull request #1862 from RaananW/prioritize-xbox-gamepad

XBOX gamepad is now prioritized
David Catuhe 8 éve
szülő
commit
b49f6a7c6d

+ 5 - 3
src/Cameras/Inputs/babylon.arcrotatecamera.input.gamepad.ts

@@ -53,9 +53,11 @@ module BABYLON {
         }
 
         private _onNewGameConnected(gamepad: Gamepad) {
-            // Only the first gamepad can control the camera
-            if (!this.gamepad && gamepad.type !== Gamepad.POSE_ENABLED) {
-                this.gamepad = gamepad;
+            if (gamepad.type !== Gamepad.POSE_ENABLED) {
+                // prioritize XBOX gamepads.
+                if (!this.gamepad || gamepad.type === Gamepad.XBOX) {
+                    this.gamepad = gamepad;
+                }
             }
         }
 

+ 5 - 2
src/Cameras/Inputs/babylon.freecamera.input.gamepad.ts

@@ -61,8 +61,11 @@ module BABYLON {
 
         private _onNewGameConnected(gamepad: Gamepad) {
             // Only the first gamepad found can control the camera
-            if (!this.gamepad && gamepad.type !== Gamepad.POSE_ENABLED) {
-                this.gamepad = gamepad;
+            if (gamepad.type !== Gamepad.POSE_ENABLED) {
+                // prioritize XBOX gamepads.
+                if (!this.gamepad || gamepad.type === Gamepad.XBOX) {
+                    this.gamepad = gamepad;
+                }
             }
         }