Vector*: Simplified setLength(). See #7326.

fc881d66 · Mr.doob · 071418ab · fc881d66 · fc881d66 · fc881d66
显示空白变更内容
内联并排

Showing with 7 addition and 25 deletion

src/math/Vector2.js src/math/Vector2.js +2 -8

src/math/Vector3.js src/math/Vector3.js +3 -9

src/math/Vector4.js src/math/Vector4.js +2 -8

未找到文件。
--- a/src/math/Vector2.js
+++ b/src/math/Vector2.js
@@ -379,15 +379,9 @@ THREE.Vector2.prototype = {

 	},

-	setLength: function ( l ) {
+	setLength: function ( length ) {

-		var oldLength = this.length();
-
-		if ( oldLength !== 0 && l !== oldLength ) {
-
-			this.multiplyScalar( l / oldLength );
-
-		}
+		this.multiplyScalar( length / this.length() );

 		return this;


--- a/src/math/Vector3.js
+++ b/src/math/Vector3.js
@@ -584,15 +584,9 @@ THREE.Vector3.prototype = {

 	},

-	setLength: function ( l ) {
+	setLength: function ( length ) {

-		var oldLength = this.length();
-
-		if ( oldLength !== 0 && l !== oldLength  ) {
-
-			this.multiplyScalar( l / oldLength );
-
-		}
+		this.multiplyScalar( length / this.length() );

 		return this;

@@ -701,7 +695,7 @@ THREE.Vector3.prototype = {

 	angleTo: function ( v ) {

-		var theta = this.dot( v ) / ( Math.sqrt( this.lengthSq() * v.lengthSq() ) );
+		var theta = this.dot( v ) / Math.sqrt( this.lengthSq() * v.lengthSq() );

 		// clamp, to handle numerical problems


--- a/src/math/Vector4.js
+++ b/src/math/Vector4.js
@@ -589,15 +589,9 @@ THREE.Vector4.prototype = {

 	},

-	setLength: function ( l ) {
+	setLength: function ( length ) {

-		var oldLength = this.length();
-
-		if ( oldLength !== 0 && l !== oldLength ) {
-
-			this.multiplyScalar( l / oldLength );
-
-		}
+		this.multiplyScalar( length / this.length() );

 		return this;