|
@@ -107,25 +107,13 @@ THREE.Object3D.prototype = {
|
|
|
|
|
|
},
|
|
|
|
|
|
- applyMatrix: function () {
|
|
|
+ applyMatrix: function ( matrix ) {
|
|
|
|
|
|
- var m1 = new THREE.Matrix4();
|
|
|
-
|
|
|
- return function ( matrix ) {
|
|
|
-
|
|
|
- this.matrix.multiplyMatrices( matrix, this.matrix );
|
|
|
+ this.matrix.multiplyMatrices( matrix, this.matrix );
|
|
|
|
|
|
- this.position.setFromMatrixPosition( this.matrix );
|
|
|
+ this.matrix.decompose( this.position, this.quaternion, this.scale );
|
|
|
|
|
|
- this.scale.setFromMatrixScale( this.matrix );
|
|
|
-
|
|
|
- m1.extractRotation( this.matrix );
|
|
|
-
|
|
|
- this.quaternion.setFromRotationMatrix( m1 );
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- }(),
|
|
|
+ },
|
|
|
|
|
|
setRotationFromAxisAngle: function ( axis, angle ) {
|
|
|
|