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

package/dist/bundle.js

@@ -101542,6 +101542,8 @@ property list uchar int vertex_index
   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 Euler(0, 0, 0, "YXZ");
   var _forward = new Vector3();
   var _right = new Vector3();
@@ -101576,7 +101578,8 @@ property list uchar int vertex_index
         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 Vector3();
@@ -101584,8 +101587,12 @@ property list uchar int vertex_index
       this._lastQuaternion = new Quaternion();
       this._position0 = new Vector3();
       this._quaternion0 = new 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);
@@ -101615,7 +101622,10 @@ property list uchar int vertex_index
       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;
@@ -101633,6 +101643,10 @@ property list uchar int vertex_index
       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();
@@ -101703,6 +101717,7 @@ property list uchar int vertex_index
     /**
      * 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) {
@@ -101714,7 +101729,7 @@ property list uchar int vertex_index
         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) {
@@ -101761,15 +101776,21 @@ property list uchar int vertex_index
       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((codes2) => codes2.some((code2) => code2.startsWith(modifier)));
+      return event.ctrlKey && !bound("Control") || event.altKey && !bound("Alt") || event.metaKey && !bound("Meta");
+    }
     actionFor(code2) {
       for (const action in this.keys) {
         if (this.keys[action].includes(code2)) return action;
@@ -101789,7 +101810,10 @@ property list uchar int vertex_index
       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) {
@@ -101805,8 +101829,20 @@ property list uchar int vertex_index
         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);
@@ -105719,6 +105755,7 @@ gl_FragDepth=readDepth(vUv);
     /**
      * 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(mode2) {