three-stdlib 2.25.1 → 2.26.0

package/controls/OrbitControls.d.ts

@@ -22,6 +22,7 @@ declare class OrbitControls extends EventDispatcher {
     panSpeed: number;
     screenSpacePanning: boolean;
     keyPanSpeed: number;
+    zoomToCursor: boolean;
     autoRotate: boolean;
     autoRotateSpeed: number;
     reverseOrbit: boolean;

package/index.cjs

@@ -890,7 +890,7 @@ const Visible = 0;
 const Deleted = 1;
 const _v1$5 = /* @__PURE__ */ new THREE.Vector3();
 const _line3 = /* @__PURE__ */ new THREE.Line3();
-const _plane$1 = /* @__PURE__ */ new THREE.Plane();
+const _plane$2 = /* @__PURE__ */ new THREE.Plane();
 const _closestPoint$1 = /* @__PURE__ */ new THREE.Vector3();
 const _triangle = /* @__PURE__ */ new THREE.Triangle();
 class ConvexHull {
@@ -1127,11 +1127,11 @@ class ConvexHull {
       }
     }
     maxDistance = -1;
-    _plane$1.setFromCoplanarPoints(v0.point, v12.point, v2.point);
+    _plane$2.setFromCoplanarPoints(v0.point, v12.point, v2.point);
     for (let i2 = 0, l = this.vertices.length; i2 < l; i2++) {
       const vertex = vertices[i2];
       if (vertex !== v0 && vertex !== v12 && vertex !== v2) {
-        const distance = Math.abs(_plane$1.distanceToPoint(vertex.point));
+        const distance = Math.abs(_plane$2.distanceToPoint(vertex.point));
         if (distance > maxDistance) {
           maxDistance = distance;
           v3 = vertex;
@@ -1139,7 +1139,7 @@ class ConvexHull {
       }
     }
     const faces = [];
-    if (_plane$1.distanceToPoint(v3.point) < 0) {
+    if (_plane$2.distanceToPoint(v3.point) < 0) {
       faces.push(Face$1.create(v0, v12, v2), Face$1.create(v3, v12, v0), Face$1.create(v3, v2, v12), Face$1.create(v3, v0, v2));
       for (let i2 = 0; i2 < 3; i2++) {
         const j = (i2 + 1) % 3;
@@ -21468,7 +21468,7 @@ class ImprovedNoise {
 }
 const _v1$2 = /* @__PURE__ */ new THREE.Vector3();
 const _v2$2 = /* @__PURE__ */ new THREE.Vector3();
-const _plane = /* @__PURE__ */ new THREE.Plane();
+const _plane$1 = /* @__PURE__ */ new THREE.Plane();
 const _line1 = /* @__PURE__ */ new THREE.Line3();
 const _line2 = /* @__PURE__ */ new THREE.Line3();
 const _sphere$1 = /* @__PURE__ */ new THREE.Sphere();
@@ -21555,16 +21555,16 @@ class Octree {
     return triangles;
   }
   triangleCapsuleIntersect(capsule, triangle) {
-    triangle.getPlane(_plane);
-    const d1 = _plane.distanceToPoint(capsule.start) - capsule.radius;
-    const d2 = _plane.distanceToPoint(capsule.end) - capsule.radius;
+    triangle.getPlane(_plane$1);
+    const d1 = _plane$1.distanceToPoint(capsule.start) - capsule.radius;
+    const d2 = _plane$1.distanceToPoint(capsule.end) - capsule.radius;
     if (d1 > 0 && d2 > 0 || d1 < -capsule.radius && d2 < -capsule.radius) {
       return false;
     }
     const delta = Math.abs(d1 / (Math.abs(d1) + Math.abs(d2)));
     const intersectPoint = _v1$2.copy(capsule.start).lerp(capsule.end, delta);
     if (triangle.containsPoint(intersectPoint)) {
-      return { normal: _plane.normal.clone(), point: intersectPoint.clone(), depth: Math.abs(Math.min(d1, d2)) };
+      return { normal: _plane$1.normal.clone(), point: intersectPoint.clone(), depth: Math.abs(Math.min(d1, d2)) };
     }
     const r2 = capsule.radius * capsule.radius;
     const line1 = _line1.set(capsule.start, capsule.end);
@@ -21587,17 +21587,17 @@ class Octree {
     return false;
   }
   triangleSphereIntersect(sphere, triangle) {
-    triangle.getPlane(_plane);
-    if (!sphere.intersectsPlane(_plane))
+    triangle.getPlane(_plane$1);
+    if (!sphere.intersectsPlane(_plane$1))
       return false;
-    const depth = Math.abs(_plane.distanceToSphere(sphere));
+    const depth = Math.abs(_plane$1.distanceToSphere(sphere));
     const r2 = sphere.radius * sphere.radius - depth * depth;
-    const plainPoint = _plane.projectPoint(sphere.center, _v1$2);
+    const plainPoint = _plane$1.projectPoint(sphere.center, _v1$2);
     if (triangle.containsPoint(sphere.center)) {
       return {
-        normal: _plane.normal.clone(),
+        normal: _plane$1.normal.clone(),
         point: plainPoint.clone(),
-        depth: Math.abs(_plane.distanceToSphere(sphere))
+        depth: Math.abs(_plane$1.distanceToSphere(sphere))
       };
     }
     const lines = [
@@ -24716,6 +24716,9 @@ class TrackballControls extends THREE.EventDispatcher {
     this.update();
   }
 }
+const _ray$2 = /* @__PURE__ */ new THREE.Ray();
+const _plane = /* @__PURE__ */ new THREE.Plane();
+const TILT_LIMIT = Math.cos(70 * THREE.MathUtils.DEG2RAD);
 const moduloWrapAround = (offset, capacity) => (offset % capacity + capacity) % capacity;
 class OrbitControls extends THREE.EventDispatcher {
   constructor(object, domElement) {
@@ -24762,6 +24765,7 @@ class OrbitControls extends THREE.EventDispatcher {
     // if false, pan orthogonal to world-space direction camera.up
     __publicField(this, "keyPanSpeed", 7);
     // pixels moved per arrow key push
+    __publicField(this, "zoomToCursor", false);
     // Set to true to automatically rotate around the target
     // If auto-rotate is enabled, you must call controls.update() in your animation loop
     __publicField(this, "autoRotate", false);
@@ -24910,13 +24914,16 @@ class OrbitControls extends THREE.EventDispatcher {
         }
         spherical.phi = Math.max(scope.minPolarAngle, Math.min(scope.maxPolarAngle, spherical.phi));
         spherical.makeSafe();
-        spherical.radius *= scale;
-        spherical.radius = Math.max(scope.minDistance, Math.min(scope.maxDistance, spherical.radius));
         if (scope.enableDamping === true) {
           scope.target.addScaledVector(panOffset, scope.dampingFactor);
         } else {
           scope.target.add(panOffset);
         }
+        if (scope.zoomToCursor && performCursorZoom || scope.object.isOrthographicCamera) {
+          spherical.radius = clampDistance(spherical.radius);
+        } else {
+          spherical.radius = clampDistance(spherical.radius * scale);
+        }
         offset.setFromSpherical(spherical);
         offset.applyQuaternion(quatInverse);
         position.copy(scope.target).add(offset);
@@ -24929,7 +24936,51 @@ class OrbitControls extends THREE.EventDispatcher {
           sphericalDelta.set(0, 0, 0);
           panOffset.set(0, 0, 0);
         }
+        let zoomChanged = false;
+        if (scope.zoomToCursor && performCursorZoom) {
+          let newRadius = null;
+          if (scope.object instanceof THREE.PerspectiveCamera && scope.object.isPerspectiveCamera) {
+            const prevRadius = offset.length();
+            newRadius = clampDistance(prevRadius * scale);
+            const radiusDelta = prevRadius - newRadius;
+            scope.object.position.addScaledVector(dollyDirection, radiusDelta);
+            scope.object.updateMatrixWorld();
+          } else if (scope.object.isOrthographicCamera) {
+            const mouseBefore = new THREE.Vector3(mouse.x, mouse.y, 0);
+            mouseBefore.unproject(scope.object);
+            scope.object.zoom = Math.max(scope.minZoom, Math.min(scope.maxZoom, scope.object.zoom / scale));
+            scope.object.updateProjectionMatrix();
+            zoomChanged = true;
+            const mouseAfter = new THREE.Vector3(mouse.x, mouse.y, 0);
+            mouseAfter.unproject(scope.object);
+            scope.object.position.sub(mouseAfter).add(mouseBefore);
+            scope.object.updateMatrixWorld();
+            newRadius = offset.length();
+          } else {
+            console.warn("WARNING: OrbitControls.js encountered an unknown camera type - zoom to cursor disabled.");
+            scope.zoomToCursor = false;
+          }
+          if (newRadius !== null) {
+            if (scope.screenSpacePanning) {
+              scope.target.set(0, 0, -1).transformDirection(scope.object.matrix).multiplyScalar(newRadius).add(scope.object.position);
+            } else {
+              _ray$2.origin.copy(scope.object.position);
+              _ray$2.direction.set(0, 0, -1).transformDirection(scope.object.matrix);
+              if (Math.abs(scope.object.up.dot(_ray$2.direction)) < TILT_LIMIT) {
+                object.lookAt(scope.target);
+              } else {
+                _plane.setFromNormalAndCoplanarPoint(scope.object.up, scope.target);
+                _ray$2.intersectPlane(_plane, scope.target);
+              }
+            }
+          }
+        } else if (scope.object instanceof THREE.OrthographicCamera && scope.object.isOrthographicCamera) {
+          scope.object.zoom = Math.max(scope.minZoom, Math.min(scope.maxZoom, scope.object.zoom / scale));
+          scope.object.updateProjectionMatrix();
+          zoomChanged = true;
+        }
         scale = 1;
+        performCursorZoom = false;
         if (zoomChanged || lastPosition.distanceToSquared(scope.object.position) > EPS2 || 8 * (1 - lastQuaternion.dot(scope.object.quaternion)) > EPS2) {
           scope.dispatchEvent(changeEvent);
           lastPosition.copy(scope.object.position);
@@ -24985,7 +25036,6 @@ class OrbitControls extends THREE.EventDispatcher {
     const sphericalDelta = new THREE.Spherical();
     let scale = 1;
     const panOffset = new THREE.Vector3();
-    let zoomChanged = false;
     const rotateStart = new THREE.Vector2();
     const rotateEnd = new THREE.Vector2();
     const rotateDelta = new THREE.Vector2();
@@ -24995,6 +25045,9 @@ class OrbitControls extends THREE.EventDispatcher {
     const dollyStart = new THREE.Vector2();
     const dollyEnd = new THREE.Vector2();
     const dollyDelta = new THREE.Vector2();
+    const dollyDirection = new THREE.Vector3();
+    const mouse = new THREE.Vector2();
+    let performCursorZoom = false;
     const pointers = [];
     const pointerPositions = {};
     function getAutoRotationAngle() {
@@ -25065,33 +25118,43 @@ class OrbitControls extends THREE.EventDispatcher {
       };
     })();
     function dollyOut(dollyScale) {
-      if (scope.object instanceof THREE.PerspectiveCamera && scope.object.isPerspectiveCamera) {
+      if (scope.object instanceof THREE.PerspectiveCamera && scope.object.isPerspectiveCamera || scope.object instanceof THREE.OrthographicCamera && scope.object.isOrthographicCamera) {
         scale /= dollyScale;
-      } else if (scope.object instanceof THREE.OrthographicCamera && scope.object.isOrthographicCamera) {
-        scope.object.zoom = Math.max(scope.minZoom, Math.min(scope.maxZoom, scope.object.zoom * dollyScale));
-        scope.object.updateProjectionMatrix();
-        zoomChanged = true;
       } else {
         console.warn("WARNING: OrbitControls.js encountered an unknown camera type - dolly/zoom disabled.");
         scope.enableZoom = false;
       }
     }
     function dollyIn(dollyScale) {
-      if (scope.object instanceof THREE.PerspectiveCamera && scope.object.isPerspectiveCamera) {
+      if (scope.object instanceof THREE.PerspectiveCamera && scope.object.isPerspectiveCamera || scope.object instanceof THREE.OrthographicCamera && scope.object.isOrthographicCamera) {
         scale *= dollyScale;
-      } else if (scope.object instanceof THREE.OrthographicCamera && scope.object.isOrthographicCamera) {
-        scope.object.zoom = Math.max(scope.minZoom, Math.min(scope.maxZoom, scope.object.zoom / dollyScale));
-        scope.object.updateProjectionMatrix();
-        zoomChanged = true;
       } else {
         console.warn("WARNING: OrbitControls.js encountered an unknown camera type - dolly/zoom disabled.");
         scope.enableZoom = false;
       }
     }
+    function updateMouseParameters(event) {
+      if (!scope.zoomToCursor || !scope.domElement) {
+        return;
+      }
+      performCursorZoom = true;
+      const rect = scope.domElement.getBoundingClientRect();
+      const x = event.clientX - rect.left;
+      const y = event.clientY - rect.top;
+      const w = rect.width;
+      const h = rect.height;
+      mouse.x = x / w * 2 - 1;
+      mouse.y = -(y / h) * 2 + 1;
+      dollyDirection.set(mouse.x, mouse.y, 1).unproject(scope.object).sub(scope.object.position).normalize();
+    }
+    function clampDistance(dist) {
+      return Math.max(scope.minDistance, Math.min(scope.maxDistance, dist));
+    }
     function handleMouseDownRotate(event) {
       rotateStart.set(event.clientX, event.clientY);
     }
     function handleMouseDownDolly(event) {
+      updateMouseParameters(event);
       dollyStart.set(event.clientX, event.clientY);
     }
     function handleMouseDownPan(event) {
@@ -25127,6 +25190,7 @@ class OrbitControls extends THREE.EventDispatcher {
       scope.update();
     }
     function handleMouseWheel(event) {
+      updateMouseParameters(event);
       if (event.deltaY < 0) {
         dollyIn(getZoomScale());
       } else if (event.deltaY > 0) {

package/index.js

@@ -872,7 +872,7 @@ const Visible = 0;
 const Deleted = 1;
 const _v1$5 = /* @__PURE__ */ new Vector3();
 const _line3 = /* @__PURE__ */ new Line3();
-const _plane$1 = /* @__PURE__ */ new Plane();
+const _plane$2 = /* @__PURE__ */ new Plane();
 const _closestPoint$1 = /* @__PURE__ */ new Vector3();
 const _triangle = /* @__PURE__ */ new Triangle$1();
 class ConvexHull {
@@ -1109,11 +1109,11 @@ class ConvexHull {
       }
     }
     maxDistance = -1;
-    _plane$1.setFromCoplanarPoints(v0.point, v12.point, v2.point);
+    _plane$2.setFromCoplanarPoints(v0.point, v12.point, v2.point);
     for (let i2 = 0, l = this.vertices.length; i2 < l; i2++) {
       const vertex = vertices[i2];
       if (vertex !== v0 && vertex !== v12 && vertex !== v2) {
-        const distance = Math.abs(_plane$1.distanceToPoint(vertex.point));
+        const distance = Math.abs(_plane$2.distanceToPoint(vertex.point));
         if (distance > maxDistance) {
           maxDistance = distance;
           v3 = vertex;
@@ -1121,7 +1121,7 @@ class ConvexHull {
       }
     }
     const faces = [];
-    if (_plane$1.distanceToPoint(v3.point) < 0) {
+    if (_plane$2.distanceToPoint(v3.point) < 0) {
       faces.push(Face$1.create(v0, v12, v2), Face$1.create(v3, v12, v0), Face$1.create(v3, v2, v12), Face$1.create(v3, v0, v2));
       for (let i2 = 0; i2 < 3; i2++) {
         const j = (i2 + 1) % 3;
@@ -21450,7 +21450,7 @@ class ImprovedNoise {
 }
 const _v1$2 = /* @__PURE__ */ new Vector3();
 const _v2$2 = /* @__PURE__ */ new Vector3();
-const _plane = /* @__PURE__ */ new Plane();
+const _plane$1 = /* @__PURE__ */ new Plane();
 const _line1 = /* @__PURE__ */ new Line3();
 const _line2 = /* @__PURE__ */ new Line3();
 const _sphere$1 = /* @__PURE__ */ new Sphere();
@@ -21537,16 +21537,16 @@ class Octree {
     return triangles;
   }
   triangleCapsuleIntersect(capsule, triangle) {
-    triangle.getPlane(_plane);
-    const d1 = _plane.distanceToPoint(capsule.start) - capsule.radius;
-    const d2 = _plane.distanceToPoint(capsule.end) - capsule.radius;
+    triangle.getPlane(_plane$1);
+    const d1 = _plane$1.distanceToPoint(capsule.start) - capsule.radius;
+    const d2 = _plane$1.distanceToPoint(capsule.end) - capsule.radius;
     if (d1 > 0 && d2 > 0 || d1 < -capsule.radius && d2 < -capsule.radius) {
       return false;
     }
     const delta = Math.abs(d1 / (Math.abs(d1) + Math.abs(d2)));
     const intersectPoint = _v1$2.copy(capsule.start).lerp(capsule.end, delta);
     if (triangle.containsPoint(intersectPoint)) {
-      return { normal: _plane.normal.clone(), point: intersectPoint.clone(), depth: Math.abs(Math.min(d1, d2)) };
+      return { normal: _plane$1.normal.clone(), point: intersectPoint.clone(), depth: Math.abs(Math.min(d1, d2)) };
     }
     const r2 = capsule.radius * capsule.radius;
     const line1 = _line1.set(capsule.start, capsule.end);
@@ -21569,17 +21569,17 @@ class Octree {
     return false;
   }
   triangleSphereIntersect(sphere, triangle) {
-    triangle.getPlane(_plane);
-    if (!sphere.intersectsPlane(_plane))
+    triangle.getPlane(_plane$1);
+    if (!sphere.intersectsPlane(_plane$1))
       return false;
-    const depth = Math.abs(_plane.distanceToSphere(sphere));
+    const depth = Math.abs(_plane$1.distanceToSphere(sphere));
     const r2 = sphere.radius * sphere.radius - depth * depth;
-    const plainPoint = _plane.projectPoint(sphere.center, _v1$2);
+    const plainPoint = _plane$1.projectPoint(sphere.center, _v1$2);
     if (triangle.containsPoint(sphere.center)) {
       return {
-        normal: _plane.normal.clone(),
+        normal: _plane$1.normal.clone(),
         point: plainPoint.clone(),
-        depth: Math.abs(_plane.distanceToSphere(sphere))
+        depth: Math.abs(_plane$1.distanceToSphere(sphere))
       };
     }
     const lines = [
@@ -24698,6 +24698,9 @@ class TrackballControls extends EventDispatcher {
     this.update();
   }
 }
+const _ray$2 = /* @__PURE__ */ new Ray();
+const _plane = /* @__PURE__ */ new Plane();
+const TILT_LIMIT = Math.cos(70 * MathUtils.DEG2RAD);
 const moduloWrapAround = (offset, capacity) => (offset % capacity + capacity) % capacity;
 class OrbitControls extends EventDispatcher {
   constructor(object, domElement) {
@@ -24744,6 +24747,7 @@ class OrbitControls extends EventDispatcher {
     // if false, pan orthogonal to world-space direction camera.up
     __publicField(this, "keyPanSpeed", 7);
     // pixels moved per arrow key push
+    __publicField(this, "zoomToCursor", false);
     // Set to true to automatically rotate around the target
     // If auto-rotate is enabled, you must call controls.update() in your animation loop
     __publicField(this, "autoRotate", false);
@@ -24892,13 +24896,16 @@ class OrbitControls extends EventDispatcher {
         }
         spherical.phi = Math.max(scope.minPolarAngle, Math.min(scope.maxPolarAngle, spherical.phi));
         spherical.makeSafe();
-        spherical.radius *= scale;
-        spherical.radius = Math.max(scope.minDistance, Math.min(scope.maxDistance, spherical.radius));
         if (scope.enableDamping === true) {
           scope.target.addScaledVector(panOffset, scope.dampingFactor);
         } else {
           scope.target.add(panOffset);
         }
+        if (scope.zoomToCursor && performCursorZoom || scope.object.isOrthographicCamera) {
+          spherical.radius = clampDistance(spherical.radius);
+        } else {
+          spherical.radius = clampDistance(spherical.radius * scale);
+        }
         offset.setFromSpherical(spherical);
         offset.applyQuaternion(quatInverse);
         position.copy(scope.target).add(offset);
@@ -24911,7 +24918,51 @@ class OrbitControls extends EventDispatcher {
           sphericalDelta.set(0, 0, 0);
           panOffset.set(0, 0, 0);
         }
+        let zoomChanged = false;
+        if (scope.zoomToCursor && performCursorZoom) {
+          let newRadius = null;
+          if (scope.object instanceof PerspectiveCamera && scope.object.isPerspectiveCamera) {
+            const prevRadius = offset.length();
+            newRadius = clampDistance(prevRadius * scale);
+            const radiusDelta = prevRadius - newRadius;
+            scope.object.position.addScaledVector(dollyDirection, radiusDelta);
+            scope.object.updateMatrixWorld();
+          } else if (scope.object.isOrthographicCamera) {
+            const mouseBefore = new Vector3(mouse.x, mouse.y, 0);
+            mouseBefore.unproject(scope.object);
+            scope.object.zoom = Math.max(scope.minZoom, Math.min(scope.maxZoom, scope.object.zoom / scale));
+            scope.object.updateProjectionMatrix();
+            zoomChanged = true;
+            const mouseAfter = new Vector3(mouse.x, mouse.y, 0);
+            mouseAfter.unproject(scope.object);
+            scope.object.position.sub(mouseAfter).add(mouseBefore);
+            scope.object.updateMatrixWorld();
+            newRadius = offset.length();
+          } else {
+            console.warn("WARNING: OrbitControls.js encountered an unknown camera type - zoom to cursor disabled.");
+            scope.zoomToCursor = false;
+          }
+          if (newRadius !== null) {
+            if (scope.screenSpacePanning) {
+              scope.target.set(0, 0, -1).transformDirection(scope.object.matrix).multiplyScalar(newRadius).add(scope.object.position);
+            } else {
+              _ray$2.origin.copy(scope.object.position);
+              _ray$2.direction.set(0, 0, -1).transformDirection(scope.object.matrix);
+              if (Math.abs(scope.object.up.dot(_ray$2.direction)) < TILT_LIMIT) {
+                object.lookAt(scope.target);
+              } else {
+                _plane.setFromNormalAndCoplanarPoint(scope.object.up, scope.target);
+                _ray$2.intersectPlane(_plane, scope.target);
+              }
+            }
+          }
+        } else if (scope.object instanceof OrthographicCamera && scope.object.isOrthographicCamera) {
+          scope.object.zoom = Math.max(scope.minZoom, Math.min(scope.maxZoom, scope.object.zoom / scale));
+          scope.object.updateProjectionMatrix();
+          zoomChanged = true;
+        }
         scale = 1;
+        performCursorZoom = false;
         if (zoomChanged || lastPosition.distanceToSquared(scope.object.position) > EPS2 || 8 * (1 - lastQuaternion.dot(scope.object.quaternion)) > EPS2) {
           scope.dispatchEvent(changeEvent);
           lastPosition.copy(scope.object.position);
@@ -24967,7 +25018,6 @@ class OrbitControls extends EventDispatcher {
     const sphericalDelta = new Spherical();
     let scale = 1;
     const panOffset = new Vector3();
-    let zoomChanged = false;
     const rotateStart = new Vector2();
     const rotateEnd = new Vector2();
     const rotateDelta = new Vector2();
@@ -24977,6 +25027,9 @@ class OrbitControls extends EventDispatcher {
     const dollyStart = new Vector2();
     const dollyEnd = new Vector2();
     const dollyDelta = new Vector2();
+    const dollyDirection = new Vector3();
+    const mouse = new Vector2();
+    let performCursorZoom = false;
     const pointers = [];
     const pointerPositions = {};
     function getAutoRotationAngle() {
@@ -25047,33 +25100,43 @@ class OrbitControls extends EventDispatcher {
       };
     })();
     function dollyOut(dollyScale) {
-      if (scope.object instanceof PerspectiveCamera && scope.object.isPerspectiveCamera) {
+      if (scope.object instanceof PerspectiveCamera && scope.object.isPerspectiveCamera || scope.object instanceof OrthographicCamera && scope.object.isOrthographicCamera) {
         scale /= dollyScale;
-      } else if (scope.object instanceof OrthographicCamera && scope.object.isOrthographicCamera) {
-        scope.object.zoom = Math.max(scope.minZoom, Math.min(scope.maxZoom, scope.object.zoom * dollyScale));
-        scope.object.updateProjectionMatrix();
-        zoomChanged = true;
       } else {
         console.warn("WARNING: OrbitControls.js encountered an unknown camera type - dolly/zoom disabled.");
         scope.enableZoom = false;
       }
     }
     function dollyIn(dollyScale) {
-      if (scope.object instanceof PerspectiveCamera && scope.object.isPerspectiveCamera) {
+      if (scope.object instanceof PerspectiveCamera && scope.object.isPerspectiveCamera || scope.object instanceof OrthographicCamera && scope.object.isOrthographicCamera) {
         scale *= dollyScale;
-      } else if (scope.object instanceof OrthographicCamera && scope.object.isOrthographicCamera) {
-        scope.object.zoom = Math.max(scope.minZoom, Math.min(scope.maxZoom, scope.object.zoom / dollyScale));
-        scope.object.updateProjectionMatrix();
-        zoomChanged = true;
       } else {
         console.warn("WARNING: OrbitControls.js encountered an unknown camera type - dolly/zoom disabled.");
         scope.enableZoom = false;
       }
     }
+    function updateMouseParameters(event) {
+      if (!scope.zoomToCursor || !scope.domElement) {
+        return;
+      }
+      performCursorZoom = true;
+      const rect = scope.domElement.getBoundingClientRect();
+      const x = event.clientX - rect.left;
+      const y = event.clientY - rect.top;
+      const w = rect.width;
+      const h = rect.height;
+      mouse.x = x / w * 2 - 1;
+      mouse.y = -(y / h) * 2 + 1;
+      dollyDirection.set(mouse.x, mouse.y, 1).unproject(scope.object).sub(scope.object.position).normalize();
+    }
+    function clampDistance(dist) {
+      return Math.max(scope.minDistance, Math.min(scope.maxDistance, dist));
+    }
     function handleMouseDownRotate(event) {
       rotateStart.set(event.clientX, event.clientY);
     }
     function handleMouseDownDolly(event) {
+      updateMouseParameters(event);
       dollyStart.set(event.clientX, event.clientY);
     }
     function handleMouseDownPan(event) {
@@ -25109,6 +25172,7 @@ class OrbitControls extends EventDispatcher {
       scope.update();
     }
     function handleMouseWheel(event) {
+      updateMouseParameters(event);
       if (event.deltaY < 0) {
         dollyIn(getZoomScale());
       } else if (event.deltaY > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-stdlib",
-  "version": "2.25.1",
+  "version": "2.26.0",
   "description": "stand-alone library of threejs examples",
   "keywords": [
     "three",