@needle-tools/three 0.169.2 → 0.169.3

package/examples/jsm/controls/OrbitControls.js

@@ -370,27 +370,27 @@ class OrbitControls extends Controls {
 		this.target.add( this.cursor );
 
 		let zoomChanged = false;
-		// adjust the camera position based on zoom only if we're not zooming to the cursor or if it's an ortho camera
-		// we adjust zoom later in these cases
-		if ( this.zoomToCursor && this._performCursorZoom || this.object.isOrthographicCamera ) {
 
-			this._spherical.radius = this._clampDistance( this._spherical.radius );
+		if ( this.enableDamping ) {
+
+			this._currentScale = MathUtils.lerp( this._currentScale, this._scale, this.dampingFactor );
 
 		} else {
 
-			if ( this.enableDamping ) {
+			this._currentScale = this._scale;
 
-				this._currentScale = MathUtils.lerp( this._currentScale, this._scale, this.dampingFactor );
+		}
 
-			} else {
+		// adjust the camera position based on zoom only if we're not zooming to the cursor or if it's an ortho camera
+		// we adjust zoom later in these cases
+		if ( this.zoomToCursor && this._performCursorZoom || this.object.isOrthographicCamera ) {
 
-				this._currentScale = this._scale;
+			this._spherical.radius = this._clampDistance( this._spherical.radius );
 
-			}
+		} else {
 
-			this._spherical.radius = this._clampDistance( this._spherical.radius * this._currentScale );
 			const prevRadius = this._spherical.radius;
-			this._spherical.radius = this._clampDistance( this._spherical.radius * this._scale );
+			this._spherical.radius = this._clampDistance( this._spherical.radius * this._currentScale );
 			zoomChanged = prevRadius != this._spherical.radius;
 
 		}
@@ -429,7 +429,7 @@ class OrbitControls extends Controls {
 				// move the camera down the pointer ray
 				// this method avoids floating point error
 				const prevRadius = _v.length();
-				newRadius = this._clampDistance( prevRadius * this._scale );
+				newRadius = this._clampDistance( prevRadius * this._currentScale );
 
 				const radiusDelta = prevRadius - newRadius;
 				this.object.position.addScaledVector( this._dollyDirection, radiusDelta );
@@ -444,7 +444,7 @@ class OrbitControls extends Controls {
 				mouseBefore.unproject( this.object );
 
 				const prevZoom = this.object.zoom;
-				this.object.zoom = Math.max( this.minZoom, Math.min( this.maxZoom, this.object.zoom / this._scale ) );
+				this.object.zoom = Math.max( this.minZoom, Math.min( this.maxZoom, this.object.zoom / this._currentScale ) );
 				this.object.updateProjectionMatrix();
 
 				zoomChanged = prevZoom !== this.object.zoom;
@@ -513,8 +513,6 @@ class OrbitControls extends Controls {
 		}
 
 		this._scale = 1;
-		this._currentScale = 1;
-		this._performCursorZoom = false;
 
 		// update condition is:
 		// min(camera displacement, camera rotation in radians)^2 > EPS
@@ -535,6 +533,9 @@ class OrbitControls extends Controls {
 
 		}
 
+
+		this._performCursorZoom = false;
+		
 		return false;
 
 	}
@@ -608,10 +609,7 @@ class OrbitControls extends Controls {
 		if ( this.object.isPerspectiveCamera ) {
 
 			// perspective
-			// NEEDLE: Support for OrbitControls on cameras that are parented to other objects.
-			const position = this.object.position;
-			this.object.getWorldPosition( position );
-			_v.copy( position ).sub( this.target );
+			this.object.getWorldPosition( _v ).sub( this.target );
 			let targetDistance = _v.length();
 
 			// half of the fov is center to top of screen

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@needle-tools/three",
-  "version": "0.169.2",
+  "version": "0.169.3",
   "description": "JavaScript 3D library",
   "type": "module",
   "main": "./build/three.cjs",