more compact version of clampLength

Mugen87 · Mugen87 · commit 3b8338c74660 · 2015-10-14T15:49:49.000+02:00
diff --git a/src/math/Vector2.js b/src/math/Vector2.js
@@ -292,15 +292,9 @@ THREE.Vector2.prototype = {
 
 	clampLength: function ( min, max ) {
 
-		var oldLength = this.length();
-
-		var newLength = ( oldLength < min ) ? min : ( ( oldLength > max ) ? max : oldLength );
-
-		if ( oldLength !== 0 && newLength !== oldLength ) {
+		var length = this.length();
 
-			this.multiplyScalar( newLength / oldLength );
-
-		}
+		this.multiplyScalar( Math.max( min, Math.min( max, length ) ) / length );
 
 		return this;
 
diff --git a/src/math/Vector3.js b/src/math/Vector3.js
@@ -522,15 +522,9 @@ THREE.Vector3.prototype = {
 
 	clampLength: function ( min, max ) {
 
-		var oldLength = this.length();
-
-		var newLength = ( oldLength < min ) ? min : ( ( oldLength > max ) ? max : oldLength );
-
-		if ( oldLength !== 0 && newLength !== oldLength ) {
+		var length = this.length();
 
-			this.multiplyScalar( newLength / oldLength );
-
-		}
+		this.multiplyScalar( Math.max( min, Math.min( max, length ) ) / length );
 
 		return this;
 
