Vector3: setFromMatrixColumn( index, matrix ) to setFromMatrixColumn( m, index )

examples/js/controls/OrbitControls.js

@@ -295,7 +295,7 @@ THREE.OrbitControls = function ( object, domElement ) {
 
 		return function panLeft( distance, objectMatrix ) {
 
-			v.setFromMatrixColumn( 0, objectMatrix );	// get X column of objectMatrix
+			v.setFromMatrixColumn( objectMatrix, 0 ); // get X column of objectMatrix
 			v.multiplyScalar( - distance );
 
 			panOffset.add( v );
@@ -310,7 +310,7 @@ THREE.OrbitControls = function ( object, domElement ) {
 
 		return function panUp( distance, objectMatrix ) {
 
-			v.setFromMatrixColumn( 1, objectMatrix ); // get Y column of objectMatrix
+			v.setFromMatrixColumn( objectMatrix, 1 ); // get Y column of objectMatrix
 			v.multiplyScalar( distance );
 
 			panOffset.add( v );

src/math/Matrix4.js

@@ -91,9 +91,9 @@ THREE.Matrix4.prototype = {
 
 	extractBasis: function ( xAxis, yAxis, zAxis ) {
 
-		xAxis.setFromMatrixColumn( 0, this );
-		yAxis.setFromMatrixColumn( 1, this );
-		zAxis.setFromMatrixColumn( 2, this );
+		xAxis.setFromMatrixColumn( this, 0 );
+		yAxis.setFromMatrixColumn( this, 1 );
+		zAxis.setFromMatrixColumn( this, 2 );
 
 		return this;
 
@@ -123,9 +123,9 @@ THREE.Matrix4.prototype = {
 			var te = this.elements;
 			var me = m.elements;
 
-			var scaleX = 1 / v1.setFromMatrixColumn( 0, m ).length();
-			var scaleY = 1 / v1.setFromMatrixColumn( 1, m ).length();
-			var scaleZ = 1 / v1.setFromMatrixColumn( 2, m ).length();
+			var scaleX = 1 / v1.setFromMatrixColumn( m, 0 ).length();
+			var scaleY = 1 / v1.setFromMatrixColumn( m, 1 ).length();
+			var scaleZ = 1 / v1.setFromMatrixColumn( m, 2 ).length();
 
 			te[ 0 ] = me[ 0 ] * scaleX;
 			te[ 1 ] = me[ 1 ] * scaleX;
@@ -589,7 +589,7 @@ THREE.Matrix4.prototype = {
 			if ( v1 === undefined ) v1 = new THREE.Vector3();
 			console.warn( 'THREE.Matrix4: .getPosition() has been removed. Use Vector3.setFromMatrixPosition( matrix ) instead.' );
 
-			return v1.setFromMatrixColumn( 3, this );
+			return v1.setFromMatrixColumn( this, 3 );
 
 		};
 

src/math/Vector3.js

@@ -706,7 +706,7 @@ THREE.Vector3.prototype = {
 
 	setFromMatrixPosition: function ( m ) {
 
-		this.setFromMatrixColumn( 3, m );
+		this.setFromMatrixColumn( m, 3 );
 
 		return this;
 
@@ -714,9 +714,9 @@ THREE.Vector3.prototype = {
 
 	setFromMatrixScale: function ( m ) {
 
-		var sx = this.setFromMatrixColumn( 0, m ).length();
-		var sy = this.setFromMatrixColumn( 1, m ).length();
-		var sz = this.setFromMatrixColumn( 2, m ).length();
+		var sx = this.setFromMatrixColumn( m, 0 ).length();
+		var sy = this.setFromMatrixColumn( m, 1 ).length();
+		var sz = this.setFromMatrixColumn( m, 2 ).length();
 
 		this.x = sx;
 		this.y = sy;
@@ -726,11 +726,11 @@ THREE.Vector3.prototype = {
 
 	},
 
-	setFromMatrixColumn: function ( index, matrix ) {
+	setFromMatrixColumn: function ( m, index ) {
 
 		var offset = index * 4;
 
-		var me = matrix.elements;
+		var me = m.elements;
 
 		this.x = me[ offset ];
 		this.y = me[ offset + 1 ];