x_ite 4.2.17 → 4.7.7

package/src/standard/Math/Numbers/Matrix3.js

@@ -60,19 +60,6 @@ function (Vector2,
 {
 "use strict";
 
-	var
-		dummyTranslation      = new Vector2 (0, 0),
-		dummyRotation         = new Vector3 (0, 0, 0),
-		dummyScale            = new Vector2 (0, 0),
-		dummyScaleOrientation = new Vector3 (0, 0, 0),
-		dummyCenter           = new Vector2 (0, 0),
-		si                    = new Matrix2 (),
-		sosi                  = new Matrix2 (),
-		rotMatrix             = new Matrix2 (),
-		soMatrix              = new Matrix2 (),
-		c                     = new Vector2 (0, 0),
-		b                     = new Matrix2 ();
-								
 	function Matrix3 ()
 	{
 		if (arguments .length)
@@ -88,7 +75,9 @@ function (Vector2,
 			this [8] = arguments [8];
 		}
 		else
+		{
 			this .identity ();
+		}
 	}
 
 	Matrix3 .prototype =
@@ -98,7 +87,7 @@ function (Vector2,
 		length: 9,
 		copy: function ()
 		{
-			var copy = Object .create (Matrix3 .prototype);
+			const copy = Object .create (Matrix3 .prototype);
 			copy [0] = this [0];
 			copy [1] = this [1];
 			copy [2] = this [2];
@@ -211,7 +200,7 @@ function (Vector2,
 
 					if (! scale .equals (Vector2 .One))
 					{
-						var hasScaleOrientation = scaleOrientation !== 0;
+						const hasScaleOrientation = scaleOrientation !== 0;
 
 						if (hasScaleOrientation)
 						{
@@ -237,7 +226,7 @@ function (Vector2,
 					this .identity ();
 					this .translate (translation);
 
-					var hasCenter = ! center .equals (Vector2 .Zero);
+					const hasCenter = ! center .equals (Vector2 .Zero);
 
 					if (hasCenter)
 						this .translate (center);
@@ -279,103 +268,123 @@ function (Vector2,
 
 			return this;
 		},
-		get: function (translation, rotation, scale, scaleOrientation, center)
+		get: (function ()
 		{
-			if (translation      === null) translation      = dummyTranslation;
-			if (rotation         === null) rotation         = dummyRotation;
-			if (scale            === null) scale            = dummyScale;
-			if (scaleOrientation === null) scaleOrientation = dummyScaleOrientation;
-			if (center           === null) center           = dummyCenter;
-
-			switch (arguments .length)
+			const
+				dummyTranslation      = new Vector2 (0, 0),
+				dummyRotation         = new Vector3 (0, 0, 0),
+				dummyScale            = new Vector2 (0, 0),
+				dummyScaleOrientation = new Vector3 (0, 0, 0),
+				dummyCenter           = new Vector2 (0, 0),
+				rotMatrix             = new Matrix2 (),
+				soMatrix              = new Matrix2 (),
+				c                     = new Vector2 (0, 0);
+
+			return function (translation, rotation, scale, scaleOrientation, center)
 			{
-				case 1:
-				{
-					translation .set (this [6], this [7]);
-					break;
-				}
-				case 2:
-				{
-					this .factor (translation, rotMatrix, dummyScale, soMatrix);
+				if (translation      === null) translation      = dummyTranslation;
+				if (rotation         === null) rotation         = dummyRotation;
+				if (scale            === null) scale            = dummyScale;
+				if (scaleOrientation === null) scaleOrientation = dummyScaleOrientation;
+				if (center           === null) center           = dummyCenter;
 
-					rotation [0] = rotMatrix [0];
-					rotation [1] = rotMatrix [1];
-					rotation [2] = Math .atan2 (rotMatrix [1], rotMatrix [0]);
-					break;
-				}
-				case 3:
+				switch (arguments .length)
 				{
-					this .factor (translation, rotMatrix, scale, soMatrix);
+					case 1:
+					{
+						translation .set (this [6], this [7]);
+						break;
+					}
+					case 2:
+					{
+						this .factor (translation, rotMatrix, dummyScale, soMatrix);
 
-					rotation [0] = rotMatrix [0];
-					rotation [1] = rotMatrix [1];
-					rotation [2] = Math .atan2 (rotMatrix [1], rotMatrix [0]);
-					break;
-				}
-				case 4:
-				{
-					this .factor (translation, rotMatrix, scale, soMatrix);
+						rotation [0] = rotMatrix [0];
+						rotation [1] = rotMatrix [1];
+						rotation [2] = Math .atan2 (rotMatrix [1], rotMatrix [0]);
+						break;
+					}
+					case 3:
+					{
+						this .factor (translation, rotMatrix, scale, soMatrix);
 
-					rotation [0] = rotMatrix [0];
-					rotation [1] = rotMatrix [1];
-					rotation [2] = Math .atan2 (rotMatrix [1], rotMatrix [0]);
+						rotation [0] = rotMatrix [0];
+						rotation [1] = rotMatrix [1];
+						rotation [2] = Math .atan2 (rotMatrix [1], rotMatrix [0]);
+						break;
+					}
+					case 4:
+					{
+						this .factor (translation, rotMatrix, scale, soMatrix);
 
-					scaleOrientation [0] = soMatrix [0];
-					scaleOrientation [1] = soMatrix [1];
-					scaleOrientation [2] = Math .atan2 (soMatrix [1], soMatrix [0]);
-					break;
-				}
-				case 5:
-				{
-					var m = new Matrix3 ();
+						rotation [0] = rotMatrix [0];
+						rotation [1] = rotMatrix [1];
+						rotation [2] = Math .atan2 (rotMatrix [1], rotMatrix [0]);
 
-					m .set (c .assign (center) .negate ());
-					m .multLeft (this);
-					m .translate (center);
+						scaleOrientation [0] = soMatrix [0];
+						scaleOrientation [1] = soMatrix [1];
+						scaleOrientation [2] = Math .atan2 (soMatrix [1], soMatrix [0]);
+						break;
+					}
+					case 5:
+					{
+						const m = new Matrix3 ();
 
-					m .get (translation, rotation, scale, scaleOrientation);
-					break;
+						m .set (c .assign (center) .negate ());
+						m .multLeft (this);
+						m .translate (center);
+
+						m .get (translation, rotation, scale, scaleOrientation);
+						break;
+					}
 				}
-			}
-		},
-		factor: function (translation, rotation, scale, scaleOrientation)
+			};
+		})(),
+		factor: (function ()
 		{
-			// (1) Get translation.
-			translation .set (this [6], this [7]);
+			const
+				si = new Matrix2 (),
+				u  = new Matrix2 (),
+				b  = new Matrix2 ();
 
-			// (2) Create 3x3 matrix.
-			var a = this .submatrix;
+			const eigen = { values: [ ], vectors: [[ ], [ ]] };
 
-			// (3) Compute det A. If negative, set sign = -1, else sign = 1
-			var det      = a .determinant ();
-			var det_sign = det < 0 ? -1 : 1;
+			return function (translation, rotation, scale, scaleOrientation)
+			{
+				// (1) Get translation.
+				translation .set (this [6], this [7]);
 
-			if (det === 0)
-				return false; // singular
+				// (2) Create 3x3 matrix.
+				const a = this .submatrix;
 
-			// (4) B = A * !A  (here !A means A transpose)
-			b .assign (a) .transpose () .multLeft (a);
-			var e = eigendecomposition (b);
+				// (3) Compute det A. If negative, set sign = -1, else sign = 1
+				const det      = a .determinant ();
+				const det_sign = det < 0 ? -1 : 1;
 
-			// Find min / max eigenvalues and do ratio test to determine singularity.
+				if (det === 0)
+					throw new Error ("Matrix3 .factor: determinant is 0.");
 
-			scaleOrientation .set (e .vectors [0] [0], e .vectors [0] [1],
-			                       e .vectors [1] [0], e .vectors [1] [1]);
+				// (4) B = A * !A  (here !A means A transpose)
+				b .assign (a) .transpose () .multLeft (a);
+				const e = eigendecomposition (b, eigen);
 
-			// Compute s = sqrt(evalues), with sign. Set si = s-inverse
+				// Find min / max eigenvalues and do ratio test to determine singularity.
 
-			scale .x = det_sign * Math .sqrt (e .values [0]);
-			scale .y = det_sign * Math .sqrt (e .values [1]);
+				scaleOrientation .set (e .vectors [0] [0], e .vectors [1] [0],
+				                       e .vectors [0] [1], e .vectors [1] [1]);
 
-			si [0] = 1 / scale .x;
-			si [3] = 1 / scale .y;
+				// Compute s = sqrt(evalues), with sign. Set si = s-inverse
 
-			// (5) Compute U = !R ~S R A.
-			rotation .assign (sosi .assign (scaleOrientation) .multRight (si) .transpose () .multLeft (scaleOrientation) .multRight (a));
+				scale .x = det_sign * Math .sqrt (e .values [0]);
+				scale .y = det_sign * Math .sqrt (e .values [1]);
 
-			scaleOrientation .transpose ();
-			return true;
-		},
+				si [0] = 1 / scale .x;
+				si [3] = 1 / scale .y;
+
+				// (5) Compute U = !R ~S R A.
+				rotation .assign (u .assign (scaleOrientation) .transpose () .multRight (si) .multRight (scaleOrientation) .multRight (a));
+			};
+		})(),
 		determinant2: function ()
 		{
 			return this [0] * this [4] -
@@ -383,7 +392,7 @@ function (Vector2,
 		},
 		determinant: function ()
 		{
-			var
+			const
 				m0 = this [0], m1 = this [1], m2 = this [2],
 				m3 = this [3], m4 = this [4], m5 = this [5],
 				m6 = this [6], m7 = this [7], m8 = this [8];
@@ -394,7 +403,7 @@ function (Vector2,
 		},
 		transpose: function ()
 		{
-			var tmp;
+			let tmp;
 
 			tmp = this [1]; this [1] = this [3]; this [3] = tmp;
 			tmp = this [2]; this [2] = this [6]; this [6] = tmp;
@@ -404,7 +413,7 @@ function (Vector2,
 		},
 		inverse: function ()
 		{
-			var
+			const
 				m0  = this [0],
 				m1  = this [1],
 				m2  = this [2],
@@ -421,21 +430,21 @@ function (Vector2,
 				t12 = m6 * m1,
 				t14 = m6 * m4;
 
-			var d = (t4 * m8 - t6 * m5 - t8 * m8 + t10 * m2 + t12 * m5 - t14 * m2);
+			let d = (t4 * m8 - t6 * m5 - t8 * m8 + t10 * m2 + t12 * m5 - t14 * m2);
 
 			if (d === 0)
 				throw new Error ("Matrix3 .inverse: determinant is 0.");
 
 			d = 1 / d;
 
-			var
+			const
 				b0 =  (m4 * m8 - m7 * m5) * d,
 				b1 = -(m1 * m8 - m7 * m2) * d,
 				b2 =  (m1 * m5 - m4 * m2) * d,
 				b3 = -(m3 * m8 - m6 * m5) * d,
 				b4 =  (m0 * m8 - m6 * m2) * d,
 				b5 = -(m0 * m5 - m3 * m2) * d;
-	
+
 			this [0] = b0;
 			this [1] = b1;
 			this [2] = b2;
@@ -450,7 +459,7 @@ function (Vector2,
 		},
 		multLeft: function (matrix)
 		{
-			var
+			const
 				a0 = this [0], a1 = this [1], a2 = this [2],
 				a3 = this [3], a4 = this [4], a5 = this [5],
 				a6 = this [6], a7 = this [7], a8 = this [8],
@@ -472,7 +481,7 @@ function (Vector2,
 		},
 		multRight: function (matrix)
 		{
-			var
+			const
 				a0 = this [0], a1 = this [1], a2 = this [2],
 				a3 = this [3], a4 = this [4], a5 = this [5],
 				a6 = this [6], a7 = this [7], a8 = this [8],
@@ -496,18 +505,18 @@ function (Vector2,
 		{
 			if (vector .length === 2)
 			{
-				var
+				const
 					x = vector .x,
 					y = vector .y,
 					w = x * this [2] + y * this [5] + this [8];
 
 				vector .x = (x * this [0] + y * this [3] + this [6]) / w;
 				vector .y = (x * this [1] + y * this [4] + this [7]) / w;
-				
+
 				return vector;
 			}
 
-			var
+			const
 				x = vector .x,
 				y = vector .y,
 				z = vector .z;
@@ -522,18 +531,18 @@ function (Vector2,
 		{
 			if (vector .length === 2)
 			{
-				var
+				const
 					x = vector .x,
 					y = vector .y,
 					w = x * this [6] + y * this [7] + this [8];
 
 				vector .x = (x * this [0] + y * this [1] + this [2]) / w;
 				vector .y = (x * this [3] + y * this [4] + this [5]) / w;
-				
+
 				return vector;
 			}
 
-			var
+			const
 				x = vector .x,
 				y = vector .y,
 				z = vector .z;
@@ -546,7 +555,7 @@ function (Vector2,
 		},
 		multDirMatrix: function (vector)
 		{
-			var
+			const
 				x = vector .x,
 				y = vector .y;
 
@@ -557,7 +566,7 @@ function (Vector2,
 		},
 		multMatrixDir: function (vector)
 		{
-			var
+			const
 				x = vector .x,
 				y = vector .y;
 
@@ -574,7 +583,7 @@ function (Vector2,
 		},
 		translate: function (translation)
 		{
-			var
+			const
 				x = translation .x,
 				y = translation .y;
 
@@ -591,7 +600,7 @@ function (Vector2,
 		},
 		scale: function (scale)
 		{
-			var
+			const
 				x = scale .x,
 				y = scale .y;
 
@@ -615,7 +624,7 @@ function (Vector2,
 	{
 		get: (function ()
 		{
-			var vector = new Vector3 (0, 0, 0);
+			const vector = new Vector3 (0, 0, 0);
 
 			return function () { return vector .set (this [0], this [1], this [2]); };
 		})(),
@@ -627,7 +636,7 @@ function (Vector2,
 	{
 		get: (function ()
 		{
-			var vector = new Vector3 (0, 0, 0);
+			const vector = new Vector3 (0, 0, 0);
 
 			return function () { return vector .set (this [3], this [4], this [5]); };
 		})(),
@@ -639,7 +648,7 @@ function (Vector2,
 	{
 		get: (function ()
 		{
-			var vector = new Vector2 (0, 0);
+			const vector = new Vector2 (0, 0);
 
 			return function () { return vector .set (this [0], this [1]); };
 		})(),
@@ -651,7 +660,7 @@ function (Vector2,
 	{
 		get: (function ()
 		{
-			var vector = new Vector2 (0, 0);
+			const vector = new Vector2 (0, 0);
 
 			return function () { return vector .set (this [3], this [4]); };
 		})(),
@@ -663,7 +672,7 @@ function (Vector2,
 	{
 		get: (function ()
 		{
-			var vector = new Vector2 (0, 0);
+			const vector = new Vector2 (0, 0);
 
 			return function () { return vector .set (this [6], this [7]); };
 		})(),
@@ -675,7 +684,7 @@ function (Vector2,
 	{
 		get: (function ()
 		{
-			var matrix = new Matrix2 ();
+			const matrix = new Matrix2 ();
 
 			return function ()
 			{
@@ -693,7 +702,7 @@ function (Vector2,
 		Identity: new Matrix3 (),
 		Rotation: function (rotation)
 		{
-			var
+			const
 				sinAngle = Math .sin (rotation),
 				cosAngle = Math .cos (rotation);
 
@@ -709,104 +718,19 @@ function (Vector2,
 		},
 		transpose: function (matrix)
 		{
-			var copy = Object .create (this .prototype);
-			copy [0] = matrix [0]; copy [1] = matrix [3]; copy [2] = matrix [6];
-			copy [3] = matrix [1]; copy [4] = matrix [4]; copy [5] = matrix [7];
-			copy [6] = matrix [2]; copy [7] = matrix [5]; copy [8] = matrix [8];
-			return copy;
+			return matrix .copy () .transpose ();
 		},
 		inverse: function (matrix)
 		{
-			var
-				copy = Object .create (this .prototype),
-				m0  = matrix [0],
-				m1  = matrix [1],
-				m2  = matrix [2],
-				m3  = matrix [3],
-				m4  = matrix [4],
-				m5  = matrix [5],
-				m6  = matrix [6],
-				m7  = matrix [7],
-				m8  = matrix [8],
-				t4  = m0 * m4,
-				t6  = m0 * m7,
-				t8  = m3 * m1,
-				t10 = m3 * m7,
-				t12 = m6 * m1,
-				t14 = m6 * m4;
-
-			var d = (t4 * m8 - t6 * m5 - t8 * m8 + t10 * m2 + t12 * m5 - t14 * m2);
-
-			if (d === 0)
-				throw new Error ("Matrix3 .inverse: determinant is 0.");
-
-			d = 1 / d;
-
-			var
-				b0 =  (m4 * m8 - m7 * m5) * d,
-				b1 = -(m1 * m8 - m7 * m2) * d,
-				b2 =  (m1 * m5 - m4 * m2) * d,
-				b3 = -(m3 * m8 - m6 * m5) * d,
-				b4 =  (m0 * m8 - m6 * m2) * d,
-				b5 = -(m0 * m5 - m3 * m2) * d;
-	
-			copy [0] = b0;
-			copy [1] = b1;
-			copy [2] = b2;
-			copy [3] = b3;
-			copy [4] = b4;
-			copy [5] = b5;
-			copy [6] =  (t10 - t14) * d;
-			copy [7] = -(t6 - t12) * d;
-			copy [8] =  (t4 - t8) * d;
-
-			return copy;
+			return matrix .copy () .inverse ();
 		},
 		multLeft: function (lhs, rhs)
 		{
-			var
-				copy = Object .create (this .prototype),
-				a0 = lhs [0], a1 = lhs [1], a2 = lhs [2],
-				a3 = lhs [3], a4 = lhs [4], a5 = lhs [5],
-				a6 = lhs [6], a7 = lhs [7], a8 = lhs [8],
-				b0 = rhs [0], b1 = rhs [1], b2 = rhs [2],
-				b3 = rhs [3], b4 = rhs [4], b5 = rhs [5],
-				b6 = rhs [6], b7 = rhs [7], b8 = rhs [8];
-
-			copy [0] = a0 * b0 + a3 * b1 + a6 * b2;
-			copy [1] = a1 * b0 + a4 * b1 + a7 * b2;
-			copy [2] = a2 * b0 + a5 * b1 + a8 * b2;
-			copy [3] = a0 * b3 + a3 * b4 + a6 * b5;
-			copy [4] = a1 * b3 + a4 * b4 + a7 * b5;
-			copy [5] = a2 * b3 + a5 * b4 + a8 * b5;
-			copy [6] = a0 * b6 + a3 * b7 + a6 * b8;
-			copy [7] = a1 * b6 + a4 * b7 + a7 * b8;
-			copy [8] = a2 * b6 + a5 * b7 + a8 * b8;
-
-			return copy;
+			return lhs .copy () .multLeft (rhs);
 		},
 		multRight: function (lhs, rhs)
 		{
-			var
-				copy = Object .create (this .prototype),
-				a0 = lhs [0], a1 = lhs [1], a2 = lhs [2],
-				a3 = lhs [3], a4 = lhs [4], a5 = lhs [5],
-				a6 = lhs [6], a7 = lhs [7], a8 = lhs [8],
-				b0 = rhs [0], b1 = rhs [1], b2 = rhs [2],
-				b3 = rhs [3], b4 = rhs [4], b5 = rhs [5],
-				b6 = rhs [6], b7 = rhs [7], b8 = rhs [8];
-
-			copy [0] = a0 * b0 + a1 * b3 + a2 * b6;
-			copy [1] = a0 * b1 + a1 * b4 + a2 * b7;
-			copy [2] = a0 * b2 + a1 * b5 + a2 * b8;
-			copy [3] = a3 * b0 + a4 * b3 + a5 * b6;
-			copy [4] = a3 * b1 + a4 * b4 + a5 * b7;
-			copy [5] = a3 * b2 + a4 * b5 + a5 * b8;
-			copy [6] = a6 * b0 + a7 * b3 + a8 * b6;
-			copy [7] = a6 * b1 + a7 * b4 + a8 * b7;
-			copy [8] = a6 * b2 + a7 * b5 + a8 * b8;
-
-			return copy;
+			return lhs .copy () .multRight (rhs);
 		},
 	});