three-gamepad-controls 0.10.5 → 0.10.6

package/dist/gamepad-arcball-controls.js

@@ -1,6 +1,6 @@
 import { GAMEPAD_AXIS, GAMEPAD_BUTTON } from "./core.js";
-import { applyGamepadDeadzone, getGamepadButtonPressed, getGamepadButtonValue } from "./utils.js";
 import { GamepadControls } from "./gamepad-controls.js";
+import { applyGamepadDeadzone, getGamepadButtonPressed, getGamepadButtonValue } from "./utils.js";
 import { Vector2, Vector3 } from "three";
 //#region src/gamepad-arcball-controls.ts
 /**

package/dist/gamepad-controls.js

@@ -1,4 +1,4 @@
-import { getFirstConnectedGamepad, getGamepadByIndex } from "./utils.js";
+import { GamepadManager } from "./gamepad-manager.js";
 import { EventDispatcher } from "three";
 //#region src/gamepad-controls.ts
 /**
@@ -17,10 +17,12 @@ var GamepadControls = class extends EventDispatcher {
 	* The currently active gamepad, or `null` if no gamepad is connected.
 	*/
 	gamepad = null;
+	#manager;
 	#onGamepadConnected;
 	#onGamepadDisconnected;
 	constructor() {
 		super();
+		this.#manager = new GamepadManager();
 		this.#onGamepadConnected = (event) => {
 			this.onGamepadConnected(event.gamepad);
 		};
@@ -37,17 +39,20 @@ var GamepadControls = class extends EventDispatcher {
 	*/
 	update(deltaTime) {
 		if (!this.enabled) return;
-		if (this.gamepad === null) {
-			const connectedGamepad = getFirstConnectedGamepad();
-			if (connectedGamepad !== null) this.onGamepadConnected(connectedGamepad);
+		this.#manager.activeGamepad = this.gamepad;
+		const { gamepad, connected, disconnected } = this.#manager.update();
+		if (connected !== null) {
+			this.#manager.activeGamepad = this.gamepad;
+			this.onGamepadConnected(connected);
+			this.#manager.activeGamepad = this.gamepad;
+		} else if (disconnected !== null) {
+			this.#manager.activeGamepad = this.gamepad;
+			this.onGamepadDisconnected(disconnected);
+			this.#manager.activeGamepad = this.gamepad;
+			return;
 		} else {
-			const previousGamepad = this.gamepad;
-			const nextGamepad = getGamepadByIndex(previousGamepad.index);
-			if (nextGamepad === null) {
-				this.onGamepadDisconnected(previousGamepad);
-				return;
-			}
-			this.gamepad = nextGamepad;
+			this.gamepad = gamepad;
+			this.#manager.activeGamepad = this.gamepad;
 		}
 		if (this.gamepad === null) return;
 		this.onUpdate(deltaTime, this.gamepad);
@@ -59,6 +64,7 @@ var GamepadControls = class extends EventDispatcher {
 		window.removeEventListener("gamepadconnected", this.#onGamepadConnected);
 		window.removeEventListener("gamepaddisconnected", this.#onGamepadDisconnected);
 		this.gamepad = null;
+		this.#manager.activeGamepad = null;
 		this.enabled = false;
 	}
 	/**
@@ -70,11 +76,14 @@ var GamepadControls = class extends EventDispatcher {
 	* @param gamepad - The gamepad that just connected.
 	*/
 	onGamepadConnected(gamepad) {
-		if (this.gamepad !== null) return;
-		this.gamepad = gamepad;
+		this.#manager.activeGamepad = this.gamepad;
+		if (!this.#manager.connect(gamepad)) return;
+		const connectedGamepad = this.#manager.activeGamepad;
+		if (connectedGamepad === null) return;
+		this.gamepad = connectedGamepad;
 		this.dispatchEvent({
 			type: "connected",
-			gamepad
+			gamepad: connectedGamepad
 		});
 	}
 	/**
@@ -86,12 +95,13 @@ var GamepadControls = class extends EventDispatcher {
 	* @param gamepad - The gamepad that just disconnected.
 	*/
 	onGamepadDisconnected(gamepad) {
-		if (this.gamepad?.index !== gamepad.index) return;
-		const disconnected = this.gamepad;
-		this.gamepad = null;
+		this.#manager.activeGamepad = this.gamepad;
+		const disconnectedGamepad = this.#manager.disconnect(gamepad);
+		if (disconnectedGamepad === null) return;
+		this.gamepad = this.#manager.activeGamepad;
 		this.dispatchEvent({
 			type: "disconnected",
-			gamepad: disconnected
+			gamepad: disconnectedGamepad
 		});
 	}
 };

package/dist/gamepad-drag-controls.js

@@ -1,6 +1,6 @@
 import { GAMEPAD_AXIS, GAMEPAD_BUTTON } from "./core.js";
-import { applyGamepadDeadzone, getGamepadButtonPressed } from "./utils.js";
 import { GamepadControls } from "./gamepad-controls.js";
+import { applyGamepadDeadzone, getGamepadButtonPressed } from "./utils.js";
 import { Matrix4, Vector2, Vector3 } from "three";
 //#region src/gamepad-drag-controls.ts
 /**

package/dist/gamepad-first-person-controls.js

@@ -1,6 +1,6 @@
 import { GAMEPAD_AXIS, GAMEPAD_BUTTON } from "./core.js";
-import { applyGamepadDeadzone, getGamepadButtonValue } from "./utils.js";
 import { GamepadControls } from "./gamepad-controls.js";
+import { applyGamepadDeadzone, getGamepadButtonValue } from "./utils.js";
 import { MathUtils, Spherical, Vector3 } from "three";
 //#region src/gamepad-first-person-controls.ts
 /**

package/dist/gamepad-fly-controls.js

@@ -1,6 +1,6 @@
 import { GAMEPAD_AXIS, GAMEPAD_BUTTON } from "./core.js";
-import { applyGamepadDeadzone, getGamepadButtonPressed, getGamepadButtonValue } from "./utils.js";
 import { GamepadControls } from "./gamepad-controls.js";
+import { applyGamepadDeadzone, getGamepadButtonPressed, getGamepadButtonValue } from "./utils.js";
 import { Quaternion } from "three";
 //#region src/gamepad-fly-controls.ts
 /**

package/dist/gamepad-manager.js

@@ -0,0 +1,104 @@
+//#region src/gamepad-manager.ts
+const EMPTY_UPDATE_RESULT = {
+	gamepad: null,
+	connected: null,
+	disconnected: null
+};
+/**
+* Internal input core that owns active gamepad polling and snapshot refresh.
+*
+* This class intentionally tracks only one active gamepad. Higher-level
+* multi-gamepad selection should be built on top of this lifecycle in a
+* later phase.
+*
+* @internal
+*/
+var GamepadManager = class {
+	/**
+	* The active gamepad snapshot, or `null` when none is active.
+	*/
+	activeGamepad = null;
+	/**
+	* Accepts a gamepad as active when no active gamepad exists.
+	*
+	* Additional connected gamepads are ignored so the current controls keep
+	* using the first active device by default.
+	*
+	* @param gamepad - Gamepad snapshot to activate.
+	* @returns `true` when the gamepad became active, otherwise `false`.
+	*/
+	connect(gamepad) {
+		if (this.activeGamepad !== null || !gamepad.connected) return false;
+		this.activeGamepad = gamepad;
+		return true;
+	}
+	/**
+	* Clears the active gamepad when it matches the disconnecting gamepad index.
+	*
+	* @param gamepad - Gamepad snapshot that disconnected.
+	* @returns The previously active gamepad when it was cleared, otherwise `null`.
+	*/
+	disconnect(gamepad) {
+		if (this.activeGamepad?.index !== gamepad.index) return null;
+		const disconnectedGamepad = this.activeGamepad;
+		this.activeGamepad = null;
+		return disconnectedGamepad;
+	}
+	/**
+	* Polls the Gamepad API and refreshes the active gamepad snapshot.
+	*
+	* The browser exposes gamepad state as snapshots, so polling must replace
+	* the stored reference before controls read axes or buttons.
+	*
+	* @returns The active gamepad and any connect/disconnect transition found.
+	*/
+	update() {
+		if (this.activeGamepad === null) {
+			const connectedGamepad = this.#getFirstConnectedGamepad();
+			if (connectedGamepad === null) return EMPTY_UPDATE_RESULT;
+			this.activeGamepad = connectedGamepad;
+			return {
+				gamepad: connectedGamepad,
+				connected: connectedGamepad,
+				disconnected: null
+			};
+		}
+		const previousGamepad = this.activeGamepad;
+		const nextGamepad = this.#getGamepadByIndex(previousGamepad.index);
+		if (nextGamepad === null) {
+			this.activeGamepad = null;
+			return {
+				gamepad: null,
+				connected: null,
+				disconnected: previousGamepad
+			};
+		}
+		this.activeGamepad = nextGamepad;
+		return {
+			gamepad: nextGamepad,
+			connected: null,
+			disconnected: null
+		};
+	}
+	/**
+	* Reads the latest connected gamepad snapshot at a known index.
+	*
+	* @param index - Browser-assigned gamepad index to refresh.
+	* @returns A connected gamepad snapshot, or `null` if it is gone.
+	*/
+	#getGamepadByIndex(index) {
+		const gamepad = navigator.getGamepads()[index] ?? null;
+		return gamepad?.connected === true ? gamepad : null;
+	}
+	/**
+	* Finds the first currently connected gamepad snapshot.
+	*
+	* @returns The first connected gamepad snapshot, or `null` if none exist.
+	*/
+	#getFirstConnectedGamepad() {
+		for (const gamepad of navigator.getGamepads()) if (gamepad?.connected === true) return gamepad;
+		return null;
+	}
+};
+//#endregion
+export { GamepadManager };

package/dist/gamepad-orbit-controls.js

@@ -1,6 +1,6 @@
 import { GAMEPAD_AXIS, GAMEPAD_BUTTON } from "./core.js";
-import { applyGamepadDeadzone, getGamepadButtonValue } from "./utils.js";
 import { GamepadControls } from "./gamepad-controls.js";
+import { applyGamepadDeadzone, getGamepadButtonValue } from "./utils.js";
 //#region src/gamepad-orbit-controls.ts
 /**
 * Default options merged in the constructor when no explicit configuration is provided.

package/dist/gamepad-pointer-lock-controls.js

@@ -1,6 +1,6 @@
 import { GAMEPAD_AXIS } from "./core.js";
-import { applyGamepadDeadzone } from "./utils.js";
 import { GamepadControls } from "./gamepad-controls.js";
+import { applyGamepadDeadzone } from "./utils.js";
 import { Euler } from "three";
 //#region src/gamepad-pointer-lock-controls.ts
 /**

package/dist/gamepad-trackball-controls.js

@@ -1,6 +1,6 @@
 import { GAMEPAD_AXIS, GAMEPAD_BUTTON } from "./core.js";
-import { applyGamepadDeadzone, getGamepadButtonValue } from "./utils.js";
 import { GamepadControls } from "./gamepad-controls.js";
+import { applyGamepadDeadzone, getGamepadButtonValue } from "./utils.js";
 //#region src/gamepad-trackball-controls.ts
 /**
 * Default options merged in the constructor when no explicit configuration is provided.

package/dist/gamepad-transform-controls.js

@@ -1,6 +1,6 @@
 import { GAMEPAD_AXIS, GAMEPAD_BUTTON } from "./core.js";
-import { applyGamepadDeadzone, getGamepadButtonPressed } from "./utils.js";
 import { GamepadControls } from "./gamepad-controls.js";
+import { applyGamepadDeadzone, getGamepadButtonPressed } from "./utils.js";
 import { Matrix4, Quaternion, Vector2, Vector3 } from "three";
 //#region src/gamepad-transform-controls.ts
 /**

package/dist/utils.js

@@ -37,24 +37,5 @@ const getGamepadButtonValue = (gamepad, button) => {
 	if (gamepadButton.value !== 0) return gamepadButton.value;
 	return gamepadButton.pressed ? 1 : 0;
 };
-/**
-* Returns a fresh connected gamepad snapshot by index.
-*
-* @param index - Gamepad index to look up.
-* @returns The connected gamepad snapshot at the index, or `null` when unavailable.
-*/
-const getGamepadByIndex = (index) => {
-	const gamepad = navigator.getGamepads()[index] ?? null;
-	return gamepad?.connected === true ? gamepad : null;
-};
-/**
-* Returns the first currently connected gamepad snapshot.
-*
-* @returns The first connected gamepad snapshot, or `null` when none are connected.
-*/
-const getFirstConnectedGamepad = () => {
-	for (const gamepad of navigator.getGamepads()) if (gamepad?.connected === true) return gamepad;
-	return null;
-};
 //#endregion
-export { applyGamepadDeadzone, getFirstConnectedGamepad, getGamepadButtonPressed, getGamepadButtonValue, getGamepadByIndex };
+export { applyGamepadDeadzone, getGamepadButtonPressed, getGamepadButtonValue };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "three-gamepad-controls",
   "description": "Gamepad support for Three.js controls.",
-  "version": "0.10.5",
+  "version": "0.10.6",
   "homepage": "https://github.com/luckasnix/three-gamepad-controls#readme",
   "author": {
     "name": "Kasnix",