three-gamepad-controls 0.25.2 → 0.25.4

package/dist/gamepad-drag-controls.d.ts

@@ -9,7 +9,8 @@ import { DragControls } from "three/addons/controls/DragControls.js";
  */
 export type GamepadDragControlsOptions = GamepadControlsOptions & {
   /**
-   * Screen-relative translation speed multiplier.
+   * Screen-relative translation speed multiplier. At full processed input,
+   * `1` moves one effective viewport width or height per second on each axis.
    * @default 1.0
    */
   dragSpeed: number;

package/dist/gamepad-drag-controls.js

@@ -1,6 +1,7 @@
 import { GAMEPAD_AXIS, GAMEPAD_BUTTON } from "./core.js";
 import { DEFAULT_GAMEPAD_STICK_PIPELINE, resolveGamepadStickBinding } from "./gamepad-stick-processing.js";
 import { GamepadControls } from "./gamepad-controls.js";
+import { getCameraViewSize } from "./three-utils.js";
 import { Matrix4, Vector2, Vector3 } from "three";
 //#region src/gamepad-drag-controls.ts
 const DEFAULT_DRAG_OPTIONS = {
@@ -32,8 +33,6 @@ var GamepadDragControls = class extends GamepadControls {
 	#parentInverse;
 	#selectedWorldPosition;
 	#selectedLocalPosition;
-	#cameraWorldPosition;
-	#cameraForward;
 	#cameraRight;
 	#cameraUp;
 	#cameraToSelected;
@@ -59,8 +58,6 @@ var GamepadDragControls = class extends GamepadControls {
 		this.#parentInverse = new Matrix4();
 		this.#selectedWorldPosition = new Vector3();
 		this.#selectedLocalPosition = new Vector3();
-		this.#cameraWorldPosition = new Vector3();
-		this.#cameraForward = new Vector3();
 		this.#cameraRight = new Vector3();
 		this.#cameraUp = new Vector3();
 		this.#cameraToSelected = new Vector3();
@@ -151,8 +148,7 @@ var GamepadDragControls = class extends GamepadControls {
 	*/
 	#applyDrag(selected, deltaTime, dragX, dragY, dragSpeed) {
 		if (dragX === 0 && dragY === 0) return false;
-		this.#updateCameraAxes();
-		this.#updateViewSizeAtSelectedDepth();
+		this.#updateDragCameraState();
 		const scale = dragSpeed * deltaTime;
 		this.#selectedWorldPosition.addScaledVector(this.#cameraRight, dragX * this.#viewSize.x * scale);
 		this.#selectedWorldPosition.addScaledVector(this.#cameraUp, -dragY * this.#viewSize.y * scale);
@@ -185,6 +181,7 @@ var GamepadDragControls = class extends GamepadControls {
 	#intersectCenter() {
 		const controls = this.#controls;
 		this.#intersections.length = 0;
+		controls.object.updateWorldMatrix(true, false);
 		controls.raycaster.setFromCamera(this.#centerNdc, controls.object);
 		controls.raycaster.intersectObjects(controls.objects, controls.recursive, this.#intersections);
 		return this.#intersections[0];
@@ -276,42 +273,17 @@ var GamepadDragControls = class extends GamepadControls {
 	}
 	#updateCameraAxes() {
 		const camera = this.#controls.object;
+		camera.updateWorldMatrix(true, false);
 		this.#cameraRight.set(1, 0, 0).applyQuaternion(camera.quaternion).normalize();
 		this.#cameraUp.set(0, 1, 0).applyQuaternion(camera.quaternion).normalize();
-		camera.getWorldDirection(this.#cameraForward).normalize();
 	}
-	#updateViewSizeAtSelectedDepth() {
+	#updateDragCameraState() {
 		const camera = this.#controls.object;
-		if (this.#isOrthographicCamera(camera)) {
-			this.#viewSize.set(Math.abs(camera.right - camera.left) / camera.zoom, Math.abs(camera.top - camera.bottom) / camera.zoom);
-			return;
-		}
-		if (this.#isPerspectiveCamera(camera)) {
-			camera.getWorldPosition(this.#cameraWorldPosition);
-			const depth = Math.max(Number.EPSILON, this.#cameraToSelected.copy(this.#selectedWorldPosition).sub(this.#cameraWorldPosition).dot(this.#cameraForward));
-			const height = 2 * Math.tan(camera.fov * Math.PI / 360) * depth;
-			this.#viewSize.set(height * camera.aspect, height);
-			return;
-		}
-		this.#viewSize.set(1, 1);
-	}
-	/**
-	* Narrows a Three.js camera to `PerspectiveCamera`.
-	*
-	* @param camera - Camera to inspect.
-	* @returns `true` when the camera is perspective.
-	*/
-	#isPerspectiveCamera(camera) {
-		return camera.isPerspectiveCamera === true;
-	}
-	/**
-	* Narrows a Three.js camera to `OrthographicCamera`.
-	*
-	* @param camera - Camera to inspect.
-	* @returns `true` when the camera is orthographic.
-	*/
-	#isOrthographicCamera(camera) {
-		return camera.isOrthographicCamera === true;
+		camera.updateWorldMatrix(true, false);
+		const view = camera.matrixWorldInverse.elements;
+		this.#cameraRight.set(view[0], view[4], view[8]).normalize();
+		this.#cameraUp.set(view[1], view[5], view[9]).normalize();
+		getCameraViewSize(camera, this.#selectedWorldPosition, this.#viewSize, this.#cameraToSelected);
 	}
 };
 //#endregion

package/dist/gamepad-transform-controls.d.ts

@@ -9,7 +9,9 @@ import { TransformControls } from "three/addons/controls/TransformControls.js";
  */
 export type GamepadTransformControlsOptions = GamepadControlsOptions & {
   /**
-   * Screen-relative translation speed multiplier.
+   * Screen-relative translation speed multiplier. `XYZ` uses effective viewport
+   * width and height per second; constrained axes use their mean in world units
+   * per second. Both are multiplied by the processed stick input.
    * @default 1.0
    */
   translateSpeed: number;
@@ -90,6 +92,8 @@ export type GamepadTransformControlsOptions = GamepadControlsOptions & {
  * Modes and axes are selected explicitly with buttons. Moving the transform
  * stick starts a native-style transform interaction, and releasing it ends
  * the interaction while keeping the active axis highlighted.
+ * Selection follows the native helper's explicit visibility flags, including
+ * combined axes and planes, independently of camera-alignment hiding.
  */
 export declare class GamepadTransformControls extends GamepadControls {
   #private;

package/dist/gamepad-transform-controls.js

@@ -1,6 +1,7 @@
 import { GAMEPAD_AXIS, GAMEPAD_BUTTON } from "./core.js";
 import { DEFAULT_GAMEPAD_STICK_PIPELINE, resolveGamepadStickBinding } from "./gamepad-stick-processing.js";
 import { GamepadControls } from "./gamepad-controls.js";
+import { getCameraViewSize } from "./three-utils.js";
 import { Matrix4, Quaternion, Vector2, Vector3 } from "three";
 //#region src/gamepad-transform-controls.ts
 const DEFAULT_TRANSFORM_OPTIONS = {
@@ -65,6 +66,8 @@ const PROJECTED_AXIS_EPSILON = .001;
 * Modes and axes are selected explicitly with buttons. Moving the transform
 * stick starts a native-style transform interaction, and releasing it ends
 * the interaction while keeping the active axis highlighted.
+* Selection follows the native helper's explicit visibility flags, including
+* combined axes and planes, independently of camera-alignment hiding.
 */
 var GamepadTransformControls = class extends GamepadControls {
 	#controls;
@@ -73,6 +76,7 @@ var GamepadTransformControls = class extends GamepadControls {
 	#viewSize;
 	#parentInverse;
 	#cameraWorldPosition;
+	#cameraSpacePosition;
 	#cameraForward;
 	#cameraRight;
 	#cameraUp;
@@ -135,6 +139,7 @@ var GamepadTransformControls = class extends GamepadControls {
 		this.#viewSize = new Vector2();
 		this.#parentInverse = new Matrix4();
 		this.#cameraWorldPosition = new Vector3();
+		this.#cameraSpacePosition = new Vector3();
 		this.#cameraForward = new Vector3();
 		this.#cameraRight = new Vector3();
 		this.#cameraUp = new Vector3();
@@ -318,9 +323,10 @@ var GamepadTransformControls = class extends GamepadControls {
 	* callbacks, interrupting this update if its context or segment was invalidated.
 	*
 	* @param context - Context expected after the operation that invoked callbacks.
+	* @param validateAxis - Also validate a newly selected axis before acquisition.
 	* @returns `true` when this update may continue applying gamepad input.
 	*/
-	#afterCallback(context) {
+	#afterCallback(context, validateAxis = false) {
 		const segment = this.#segment;
 		if (!this.#matchesContext(context)) {
 			this.#interrupted = true;
@@ -328,6 +334,7 @@ var GamepadTransformControls = class extends GamepadControls {
 		}
 		this.#reconcileSegment();
 		if (segment !== null && this.#segment !== segment) this.#interrupted = true;
+		if (validateAxis && context.axis !== null && !this.#isAxisAllowed(context.mode, context.axis)) this.#interrupted = true;
 		return this.#canApplyInput();
 	}
 	/**
@@ -344,7 +351,7 @@ var GamepadTransformControls = class extends GamepadControls {
 		};
 		const controls = this.#controls;
 		controls[key] = value;
-		this.#afterCallback(context);
+		this.#afterCallback(context, key === "axis");
 	}
 	/**
 	* Applies mode, space, and axis button transitions from the current frame.
@@ -401,7 +408,10 @@ var GamepadTransformControls = class extends GamepadControls {
 	* @param axis - Axis requested by the gamepad button mapping.
 	*/
 	#selectAxis(axis) {
-		if (!this.#isAxisAllowed(this.#controls.mode, axis)) return;
+		if (!this.#isAxisAllowed(this.#controls.mode, axis)) {
+			if (this.#resolveAxis() === null) this.#setActiveAxis(null);
+			return;
+		}
 		this.#endTransform(false);
 		if (!this.#canApplyInput()) return;
 		this.#setActiveAxis(axis);
@@ -410,8 +420,7 @@ var GamepadTransformControls = class extends GamepadControls {
 	* Selects the next visible composite axis available in the current mode.
 	*/
 	#cycleCompositeAxis() {
-		const validAxes = this.#getVisibleAxes(COMPOSITE_AXES[this.#controls.mode]);
-		this.#cycleThroughAxes(validAxes, 1);
+		this.#cycleThroughAxes(COMPOSITE_AXES[this.#controls.mode], 1);
 	}
 	/**
 	* Cycles through all valid axes for the current mode.
@@ -419,17 +428,18 @@ var GamepadTransformControls = class extends GamepadControls {
 	* @param direction - `1` for next axis, `-1` for previous axis.
 	*/
 	#cycleAxis(direction) {
-		this.#cycleThroughAxes(this.#getValidAxes(this.#controls.mode), direction);
+		this.#cycleThroughAxes(MODE_AXES[this.#controls.mode], direction);
 	}
 	/**
-	* Moves the active axis through a candidate axis list.
+	* Moves the active axis through candidates permitted after end callbacks.
 	*
-	* @param axes - Candidate axes to cycle through.
+	* @param candidates - Unfiltered candidate axes to cycle through.
 	* @param direction - `1` for next axis, `-1` for previous axis.
 	*/
-	#cycleThroughAxes(axes, direction) {
+	#cycleThroughAxes(candidates, direction) {
 		this.#endTransform(false);
 		if (!this.#canApplyInput()) return;
+		const axes = this.#getVisibleAxes(candidates);
 		if (axes.length === 0) {
 			this.#setActiveAxis(null);
 			return;
@@ -454,11 +464,16 @@ var GamepadTransformControls = class extends GamepadControls {
 		return current !== null && validAxes.includes(current) ? current : validAxes[0] ?? null;
 	}
 	/**
-	* Updates both the remembered axis for the current mode and the control axis.
+	* Revalidates a candidate after end callbacks before updating axis memory
+	* and the control. An invalidated candidate interrupts this update.
 	*
 	* @param axis - Axis to activate, or `null` to clear selection.
 	*/
 	#setActiveAxis(axis) {
+		if (axis !== null && !this.#isAxisAllowed(this.#controls.mode, axis)) {
+			this.#interrupted = true;
+			return;
+		}
 		this.#activeAxisByMode[this.#controls.mode] = axis;
 		if (this.#controls.axis !== axis) this.#writeProperty("axis", axis);
 	}
@@ -493,7 +508,8 @@ var GamepadTransformControls = class extends GamepadControls {
 		return MODE_AXES[mode].includes(axis) && this.#isAxisVisible(axis);
 	}
 	/**
-	* Reads TransformControls visibility flags for an axis or plane.
+	* Reads the native helper's explicit axis and plane visibility flags.
+	* Camera-alignment hiding does not prohibit gamepad selection.
 	*
 	* @param axis - Axis whose visibility should be checked.
 	* @returns `true` when all components required by the axis are visible.
@@ -507,9 +523,9 @@ var GamepadTransformControls = class extends GamepadControls {
 			case "XY": return controls.showX && controls.showY && controls.showXY;
 			case "YZ": return controls.showY && controls.showZ && controls.showYZ;
 			case "XZ": return controls.showX && controls.showZ && controls.showXZ;
-			case "XYZ":
-			case "XYZE": return controls.showX && controls.showY && controls.showZ;
-			case "E": return true;
+			case "XYZ": return controls.showX && controls.showY && controls.showZ && controls.showXY && controls.showYZ;
+			case "XYZE": return controls.showX && controls.showY && controls.showZ && controls.showXY && controls.showYZ && controls.showXYZE;
+			case "E": return controls.showX && controls.showY && controls.showZ && controls.showE;
 		}
 	}
 	/**
@@ -847,7 +863,7 @@ var GamepadTransformControls = class extends GamepadControls {
 	*/
 	#updateCameraState(object) {
 		const camera = this.#controls.camera;
-		camera.updateMatrixWorld();
+		camera.updateWorldMatrix(true, false);
 		object.updateWorldMatrix(true, false);
 		this.#cameraRight.setFromMatrixColumn(camera.matrixWorld, 0).normalize();
 		this.#cameraUp.setFromMatrixColumn(camera.matrixWorld, 1).normalize();
@@ -855,25 +871,7 @@ var GamepadTransformControls = class extends GamepadControls {
 		camera.getWorldPosition(this.#cameraWorldPosition);
 		this.#worldPosition.setFromMatrixPosition(object.matrixWorld);
 		this.#eye.copy(this.#cameraWorldPosition).sub(this.#worldPosition).normalize();
-		this.#updateViewSizeAtObjectDepth(camera);
-	}
-	/**
-	* Computes world-space viewport size at the attached object's depth.
-	*
-	* @param camera - TransformControls camera.
-	*/
-	#updateViewSizeAtObjectDepth(camera) {
-		if (this.#isOrthographicCamera(camera)) {
-			this.#viewSize.set(Math.abs(camera.right - camera.left) / camera.zoom, Math.abs(camera.top - camera.bottom) / camera.zoom);
-			return;
-		}
-		if (this.#isPerspectiveCamera(camera)) {
-			const depth = Math.max(Number.EPSILON, this.#worldPosition.subVectors(this.#worldPosition, this.#cameraWorldPosition).dot(this.#cameraForward));
-			const height = 2 * Math.tan(camera.fov * Math.PI / 360) * depth;
-			this.#viewSize.set(height * camera.aspect, height);
-			return;
-		}
-		this.#viewSize.set(1, 1);
+		getCameraViewSize(camera, this.#worldPosition, this.#viewSize, this.#cameraSpacePosition);
 	}
 	/**
 	* Resolves a transform axis letter to a normalized world-space direction.
@@ -1078,24 +1076,6 @@ var GamepadTransformControls = class extends GamepadControls {
 		for (const button of buttons) if (input.wasPressed(button)) startedButtons.add(button);
 		return startedButtons;
 	}
-	/**
-	* Narrows a Three.js camera to `PerspectiveCamera`.
-	*
-	* @param camera - Camera to inspect.
-	* @returns `true` when the camera is perspective.
-	*/
-	#isPerspectiveCamera(camera) {
-		return camera.isPerspectiveCamera === true;
-	}
-	/**
-	* Narrows a Three.js camera to `OrthographicCamera`.
-	*
-	* @param camera - Camera to inspect.
-	* @returns `true` when the camera is orthographic.
-	*/
-	#isOrthographicCamera(camera) {
-		return camera.isOrthographicCamera === true;
-	}
 };
 //#endregion
 export { GamepadTransformControls };

package/dist/three-utils.js

@@ -0,0 +1,27 @@
+//#region src/three-utils.ts
+/**
+* Reads the effective viewport dimensions at a world-space point.
+*
+* The caller updates camera world and projection matrices and owns both reusable
+* vectors. View offsets change dimensions, not the point's accumulated position.
+*
+* @param camera - Camera whose current projection is used.
+* @param worldPosition - World-space point, left unchanged.
+* @param target - Receives viewport width and height in world units.
+* @param cameraPosition - Scratch vector for camera-space depth.
+* @returns The target vector, or a unit viewport for an unknown camera type.
+*/
+const getCameraViewSize = (camera, worldPosition, target, cameraPosition) => {
+	if (camera.isOrthographicCamera === true) {
+		const projection = camera.projectionMatrix.elements;
+		return target.set(Math.abs(2 / projection[0]), Math.abs(2 / projection[5]));
+	}
+	if (camera.isPerspectiveCamera === true) {
+		cameraPosition.copy(worldPosition).applyMatrix4(camera.matrixWorldInverse);
+		const depth = Math.max(Number.EPSILON, -cameraPosition.z);
+		return camera.getViewSize(depth, target);
+	}
+	return target.set(1, 1);
+};
+//#endregion
+export { getCameraViewSize };

package/package.json

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