minerender 2.1.0-alpha.117 → 2.1.0-alpha.118

package/dist/browser/index.d.mts

@@ -2923,11 +2923,12 @@ interface FlyControlsEventMap {
 type FlyAction = "forward" | "back" | "left" | "right" | "up" | "down" | "sprint";
 /**
  * Creative-flight camera controls: WASD moves horizontally along the view direction, space and shift
- * move up and down, control sprints, and the mouse turns the camera (pointer lock, or drag).
+ * move up and down, R sprints, and the mouse turns the camera (pointer lock, or drag).
  *
  * Call {@link FlyControls.update} with the elapsed seconds once per frame; the `change` event marks the
  * renderer dirty while keys are held. Speeds use scene units (16 per block). The element becomes focusable
- * and keys apply while it has focus or the pointer is locked. The wheel changes the speed, as in vanilla
+ * and keys apply while it has focus or the pointer is locked. A key pressed with Control, Alt, or Command
+ * stays a browser shortcut unless that modifier is bound. The wheel changes the speed, as in vanilla
  * spectator mode. Touch input uses the left half of the element as a joystick and the right half for looking.
  */
 declare class FlyControls extends Controls<FlyControlsEventMap, Camera> {
@@ -2959,9 +2960,13 @@ declare class FlyControls extends Controls<FlyControlsEventMap, Camera> {
     private _position0;
     private _quaternion0;
     private _dragPointer?;
+    private _dragX;
+    private _dragY;
     private _dragMoved;
+    private _dragTravel;
     private _joystick?;
     private _locked;
+    private _madeFocusable;
     private _lastTime?;
     private readonly _onKeyDown;
     private readonly _onKeyUp;
@@ -2999,12 +3004,15 @@ declare class FlyControls extends Controls<FlyControlsEventMap, Camera> {
     /**
      * Advances movement by `delta` seconds (measured since the previous call when omitted)
      * and dispatches `change` when the camera moved.
+     * A step longer than 0.1 s is applied as 0.1 s.
      */
     update(delta?: number): void;
     private move;
     private notifyChange;
     private releaseKeys;
     private handleKey;
+    /** A key pressed with Control, Alt, or Command stays a browser shortcut unless that modifier is bound to an action. */
+    private isBrowserShortcut;
     private actionFor;
     private handlePointerDown;
     private onJoystickSide;
@@ -3060,6 +3068,7 @@ declare class Renderer implements Disposable {
     /**
      * Replaces renderer-owned controls with the selected mode, keeping the camera where it is.
      * Switching to orbit controls targets the point the camera looks at, at the previous orbit distance.
+     * The previous controls object is disposed, so its listeners and settings do not carry over.
      * Returns the new controls, or undefined when controls were disabled at construction or after disposal.
      */
     setControlsMode(mode: ControlsMode): Maybe<RendererControls>;

package/dist/browser/index.d.ts

@@ -2923,11 +2923,12 @@ interface FlyControlsEventMap {
 type FlyAction = "forward" | "back" | "left" | "right" | "up" | "down" | "sprint";
 /**
  * Creative-flight camera controls: WASD moves horizontally along the view direction, space and shift
- * move up and down, control sprints, and the mouse turns the camera (pointer lock, or drag).
+ * move up and down, R sprints, and the mouse turns the camera (pointer lock, or drag).
  *
  * Call {@link FlyControls.update} with the elapsed seconds once per frame; the `change` event marks the
  * renderer dirty while keys are held. Speeds use scene units (16 per block). The element becomes focusable
- * and keys apply while it has focus or the pointer is locked. The wheel changes the speed, as in vanilla
+ * and keys apply while it has focus or the pointer is locked. A key pressed with Control, Alt, or Command
+ * stays a browser shortcut unless that modifier is bound. The wheel changes the speed, as in vanilla
  * spectator mode. Touch input uses the left half of the element as a joystick and the right half for looking.
  */
 declare class FlyControls extends Controls<FlyControlsEventMap, Camera> {
@@ -2959,9 +2960,13 @@ declare class FlyControls extends Controls<FlyControlsEventMap, Camera> {
     private _position0;
     private _quaternion0;
     private _dragPointer?;
+    private _dragX;
+    private _dragY;
     private _dragMoved;
+    private _dragTravel;
     private _joystick?;
     private _locked;
+    private _madeFocusable;
     private _lastTime?;
     private readonly _onKeyDown;
     private readonly _onKeyUp;
@@ -2999,12 +3004,15 @@ declare class FlyControls extends Controls<FlyControlsEventMap, Camera> {
     /**
      * Advances movement by `delta` seconds (measured since the previous call when omitted)
      * and dispatches `change` when the camera moved.
+     * A step longer than 0.1 s is applied as 0.1 s.
      */
     update(delta?: number): void;
     private move;
     private notifyChange;
     private releaseKeys;
     private handleKey;
+    /** A key pressed with Control, Alt, or Command stays a browser shortcut unless that modifier is bound to an action. */
+    private isBrowserShortcut;
     private actionFor;
     private handlePointerDown;
     private onJoystickSide;
@@ -3060,6 +3068,7 @@ declare class Renderer implements Disposable {
     /**
      * Replaces renderer-owned controls with the selected mode, keeping the camera where it is.
      * Switching to orbit controls targets the point the camera looks at, at the previous orbit distance.
+     * The previous controls object is disposed, so its listeners and settings do not carry over.
      * Returns the new controls, or undefined when controls were disabled at construction or after disposal.
      */
     setControlsMode(mode: ControlsMode): Maybe<RendererControls>;

package/dist/browser/index.js

@@ -13387,6 +13387,8 @@ var import_three35 = require("three");
 var VANILLA_FLY_SPEED = 10.89;
 var PITCH_LIMIT = Math.PI / 2;
 var MOVE_EPSILON = 1e-6;
+var MAX_STEP_SECONDS = 0.1;
+var CLICK_SLOP_PIXELS = 4;
 var _euler = new import_three35.Euler(0, 0, 0, "YXZ");
 var _forward = new import_three35.Vector3();
 var _right = new import_three35.Vector3();
@@ -13421,7 +13423,8 @@ var FlyControls = class extends import_three35.Controls {
       right: ["KeyD", "ArrowRight"],
       up: ["Space"],
       down: ["ShiftLeft", "ShiftRight"],
-      sprint: ["ControlLeft", "ControlRight"]
+      // Not Control: Ctrl+W closes the browser tab on Windows and Linux, and a page cannot block it.
+      sprint: ["KeyR"]
     };
     this._pressed = /* @__PURE__ */ new Set();
     this._velocity = new import_three35.Vector3();
@@ -13429,8 +13432,12 @@ var FlyControls = class extends import_three35.Controls {
     this._lastQuaternion = new import_three35.Quaternion();
     this._position0 = new import_three35.Vector3();
     this._quaternion0 = new import_three35.Quaternion();
+    this._dragX = 0;
+    this._dragY = 0;
     this._dragMoved = false;
+    this._dragTravel = 0;
     this._locked = false;
+    this._madeFocusable = false;
     this._onKeyDown = (event) => this.handleKey(event, true);
     this._onKeyUp = (event) => this.handleKey(event, false);
     this._onPointerDown = (event) => this.handlePointerDown(event);
@@ -13460,7 +13467,10 @@ var FlyControls = class extends import_three35.Controls {
     element.addEventListener("wheel", this._onWheel, { passive: false });
     element.addEventListener("blur", this._onBlur);
     element.style.touchAction = "none";
-    if (element.tabIndex < 0) element.tabIndex = 0;
+    if (element.tabIndex < 0) {
+      element.tabIndex = 0;
+      this._madeFocusable = true;
+    }
   }
   disconnect() {
     const element = this.domElement;
@@ -13478,6 +13488,10 @@ var FlyControls = class extends import_three35.Controls {
     element.removeEventListener("wheel", this._onWheel);
     element.removeEventListener("blur", this._onBlur);
     element.style.touchAction = "auto";
+    if (this._madeFocusable) {
+      element.removeAttribute("tabindex");
+      this._madeFocusable = false;
+    }
     this.unlock();
     this._locked = false;
     this.releaseKeys();
@@ -13548,6 +13562,7 @@ var FlyControls = class extends import_three35.Controls {
   /**
    * Advances movement by `delta` seconds (measured since the previous call when omitted)
    * and dispatches `change` when the camera moved.
+   * A step longer than 0.1 s is applied as 0.1 s.
    */
   update(delta) {
     if (delta === void 0) {
@@ -13559,7 +13574,7 @@ var FlyControls = class extends import_three35.Controls {
       this._velocity.set(0, 0, 0);
       return;
     }
-    if (delta > 0) this.move(delta);
+    if (delta > 0) this.move(Math.min(delta, MAX_STEP_SECONDS));
     this.notifyChange();
   }
   move(delta) {
@@ -13606,15 +13621,21 @@ var FlyControls = class extends import_three35.Controls {
     this._pressed.clear();
   }
   handleKey(event, down) {
+    if (event.code === "MetaLeft" || event.code === "MetaRight") this.releaseKeys();
     const action = this.actionFor(event.code);
     if (!action) return;
     const ownsInput = this.enabled && (this._locked || event.target === this.domElement);
-    if (down && !ownsInput) return;
+    if (down && (!ownsInput || this.isBrowserShortcut(event))) return;
     const pressed = this._pressed.has(action);
     if (down) this._pressed.add(action);
     else this._pressed.delete(action);
     if (ownsInput || this.enabled && pressed) event.preventDefault();
   }
+  /** A key pressed with Control, Alt, or Command stays a browser shortcut unless that modifier is bound to an action. */
+  isBrowserShortcut(event) {
+    const bound = (modifier) => Object.values(this.keys).some((codes) => codes.some((code) => code.startsWith(modifier)));
+    return event.ctrlKey && !bound("Control") || event.altKey && !bound("Alt") || event.metaKey && !bound("Meta");
+  }
   actionFor(code) {
     for (const action in this.keys) {
       if (this.keys[action].includes(code)) return action;
@@ -13634,7 +13655,10 @@ var FlyControls = class extends import_three35.Controls {
     if (this._dragPointer !== void 0) return;
     if (event.pointerType === "mouse" && event.button !== 0 && event.button !== 2) return;
     this._dragPointer = event.pointerId;
+    this._dragX = event.clientX;
+    this._dragY = event.clientY;
     this._dragMoved = false;
+    this._dragTravel = 0;
     element.setPointerCapture?.(event.pointerId);
   }
   onJoystickSide(event) {
@@ -13650,8 +13674,20 @@ var FlyControls = class extends import_three35.Controls {
       return;
     }
     if (!this._locked && event.pointerId !== this._dragPointer) return;
-    const dx = event.movementX ?? 0;
-    const dy = event.movementY ?? 0;
+    let dx, dy;
+    if (this._locked) {
+      dx = event.movementX ?? 0;
+      dy = event.movementY ?? 0;
+    } else {
+      dx = event.clientX - this._dragX;
+      dy = event.clientY - this._dragY;
+      this._dragX = event.clientX;
+      this._dragY = event.clientY;
+      if (!this._dragMoved) {
+        this._dragTravel += Math.hypot(dx, dy);
+        if (this._dragTravel <= CLICK_SLOP_PIXELS) return;
+      }
+    }
     if (!dx && !dy) return;
     this._dragMoved = true;
     this.turn(dx, dy);
@@ -15561,6 +15597,7 @@ var _Renderer = class _Renderer {
   /**
    * Replaces renderer-owned controls with the selected mode, keeping the camera where it is.
    * Switching to orbit controls targets the point the camera looks at, at the previous orbit distance.
+   * The previous controls object is disposed, so its listeners and settings do not carry over.
    * Returns the new controls, or undefined when controls were disabled at construction or after disposal.
    */
   setControlsMode(mode) {