three-gamepad-controls 0.25.7 → 0.25.8

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

@@ -76,6 +76,9 @@ export type GamepadArcballControlsOptions = GamepadControlsOptions & {
  * needed after manual camera or target changes, matching Arcball's native API.
  * Gamepad `start`, `change`, and `end` events are dispatched on the native controls.
  * The balanced session belongs to this wrapper, including isolated focus commands.
+ * Zoom and focus preserve native `adjustNearFar` clipping and projection behavior,
+ * including restoration of the native initial planes on the next scale operation
+ * after adjustment is disabled. Focus without zoom leaves clipping unchanged.
  */
 export declare class GamepadArcballControls extends GamepadControls {
   #private;

package/dist/gamepad-arcball-controls.js

@@ -1,7 +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 { Vector2, Vector3 } from "three";
+import { Box3, Matrix4, Sphere, Vector2, Vector3 } from "three";
 // src/gamepad-arcball-controls.ts
 const DEFAULT_ARCBALL_OPTIONS = {
 	rotateSpeed: 1,
@@ -34,6 +34,9 @@ const ZOOM_NOTCHES_PER_SECOND = 8;
 * needed after manual camera or target changes, matching Arcball's native API.
 * Gamepad `start`, `change`, and `end` events are dispatched on the native controls.
 * The balanced session belongs to this wrapper, including isolated focus commands.
+* Zoom and focus preserve native `adjustNearFar` clipping and projection behavior,
+* including restoration of the native initial planes on the next scale operation
+* after adjustment is disabled. Focus without zoom leaves clipping unchanged.
 */
 var GamepadArcballControls = class extends GamepadControls {
 	#controls;
@@ -45,6 +48,9 @@ var GamepadArcballControls = class extends GamepadControls {
 	#cameraForward;
 	#cameraRight;
 	#previousUp;
+	#scaleMatrix = new Matrix4();
+	#gizmoBounds = new Box3();
+	#gizmoSphere = new Sphere();
 	/** Whether this wrapper owns an active gamepad interaction. */
 	#wasInteracting = false;
 	/** Blocks recursive updates while a frame is being processed. */
@@ -274,7 +280,8 @@ var GamepadArcballControls = class extends GamepadControls {
 		controls.updateMatrixState();
 		const transformation = controls.scale(size, controls._gizmos.position);
 		if (transformation === void 0) return false;
-		this.#applyTransform(transformation);
+		this.#applyScaleTransform(transformation);
+		controls.updateMatrixState();
 		return true;
 	}
 	/**
@@ -303,7 +310,19 @@ var GamepadArcballControls = class extends GamepadControls {
 		if (point === null) return false;
 		const controls = this.#controls;
 		controls.updateMatrixState();
-		controls.focus(point, controls.scaleFactor);
+		const descriptor = Object.getOwnPropertyDescriptor(controls, "applyTransformMatrix");
+		const applyScale = (transformation) => {
+			this.#applyScaleTransform(transformation);
+		};
+		controls.applyTransformMatrix = applyScale;
+		try {
+			controls.focus(point, controls.scaleFactor);
+		} finally {
+			if (controls.applyTransformMatrix === applyScale) {
+				if (descriptor) Object.defineProperty(controls, "applyTransformMatrix", descriptor);
+				else Reflect.deleteProperty(controls, "applyTransformMatrix");
+			}
+		}
 		controls.updateMatrixState();
 		return true;
 	}
@@ -317,6 +336,43 @@ var GamepadArcballControls = class extends GamepadControls {
 		this.#controls.updateMatrixState();
 	}
 	/**
+	* Applies native scale matrices and geometric side effects exactly once.
+	* Arcball's own applicator gates these effects on inaccessible state Symbols.
+	* Reproduce its scale/focus branch without entering or borrowing pointer state;
+	* native scale() and focus() still own the transformation and limit calculations.
+	* Cached baselines must stay intact until focus() restores its temporary ones.
+	*
+	* @param transformation - Native camera and gizmo scale transformations.
+	*/
+	#applyScaleTransform(transformation) {
+		const controls = this.#controls;
+		const camera = controls.object;
+		const gizmos = controls._gizmos;
+		if (transformation.camera !== null) {
+			this.#scaleMatrix.copy(controls._cameraMatrixState).premultiply(transformation.camera).decompose(camera.position, camera.quaternion, camera.scale);
+			camera.updateMatrix();
+		}
+		if (transformation.gizmos !== null) {
+			this.#scaleMatrix.copy(controls._gizmoMatrixState).premultiply(transformation.gizmos).decompose(gizmos.position, gizmos.quaternion, gizmos.scale);
+			gizmos.updateMatrix();
+		}
+		controls._tbRadius = controls.calculateTbRadius(camera);
+		if (controls.adjustNearFar) {
+			const distance = camera.position.distanceTo(gizmos.position);
+			this.#gizmoBounds.setFromObject(gizmos).getBoundingSphere(this.#gizmoSphere);
+			const { radius, center } = this.#gizmoSphere;
+			const adjustedNear = Math.max(controls._nearPos0, radius + center.length());
+			const adjustedFar = Math.min(controls._farPos0, -radius + center.length());
+			camera.near = distance - Math.min(adjustedNear, distance - controls._initialNear);
+			camera.far = distance - Math.min(adjustedFar, distance - controls._initialFar);
+			camera.updateProjectionMatrix();
+		} else if (camera.near !== controls._initialNear || camera.far !== controls._initialFar) {
+			camera.near = controls._initialNear;
+			camera.far = controls._initialFar;
+			camera.updateProjectionMatrix();
+		}
+	}
+	/**
 	* Consumes a focus-button press and resolves the viewport center hit point.
 	*
 	* @param buttonFocus - Button index configured for focus.

package/package.json

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