|
@@ -91,11 +91,9 @@ THREE.Matrix4.prototype = {
|
|
|
|
|
|
extractBasis: function ( xAxis, yAxis, zAxis ) {
|
|
|
|
|
|
- var te = this.elements;
|
|
|
-
|
|
|
- xAxis.set( te[ 0 ], te[ 1 ], te[ 2 ] );
|
|
|
- yAxis.set( te[ 4 ], te[ 5 ], te[ 6 ] );
|
|
|
- zAxis.set( te[ 8 ], te[ 9 ], te[ 10 ] );
|
|
|
+ xAxis.setFromMatrixColumn( 0, this );
|
|
|
+ yAxis.setFromMatrixColumn( 1, this );
|
|
|
+ zAxis.setFromMatrixColumn( 2, this );
|
|
|
|
|
|
return this;
|
|
|
|
|
@@ -125,9 +123,9 @@ THREE.Matrix4.prototype = {
|
|
|
var te = this.elements;
|
|
|
var me = m.elements;
|
|
|
|
|
|
- var scaleX = 1 / v1.set( me[ 0 ], me[ 1 ], me[ 2 ] ).length();
|
|
|
- var scaleY = 1 / v1.set( me[ 4 ], me[ 5 ], me[ 6 ] ).length();
|
|
|
- var scaleZ = 1 / v1.set( me[ 8 ], me[ 9 ], me[ 10 ] ).length();
|
|
|
+ var scaleX = 1 / v1.setFromMatrixColumn( 0, m ).length();
|
|
|
+ var scaleY = 1 / v1.setFromMatrixColumn( 1, m ).length();
|
|
|
+ var scaleZ = 1 / v1.setFromMatrixColumn( 2, m ).length();
|
|
|
|
|
|
te[ 0 ] = me[ 0 ] * scaleX;
|
|
|
te[ 1 ] = me[ 1 ] * scaleX;
|
|
@@ -591,8 +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.' );
|
|
|
|
|
|
- var te = this.elements;
|
|
|
- return v1.set( te[ 12 ], te[ 13 ], te[ 14 ] );
|
|
|
+ return v1.setFromMatrixColumn( 3, this );
|
|
|
|
|
|
};
|
|
|
|