提交 d581bd7d 编写于 作者: M Mr.doob

Updated builds.

上级 d8f7ccf2
......@@ -3392,7 +3392,10 @@
copy: function ( m ) {
for ( var i = 0; i < 16; i ++ ) this.elements[ i ] = m.elements[ i ];
var te = this.elements;
var me = m.elements;
for ( var i = 0; i < 16; i ++ ) te[ i ] = me[ i ];
return this;
......@@ -3400,8 +3403,7 @@
copyPosition: function ( m ) {
var te = this.elements;
var me = m.elements;
var te = this.elements, me = m.elements;
te[ 12 ] = me[ 12 ];
te[ 13 ] = me[ 13 ];
......@@ -3467,7 +3469,7 @@
makeRotationFromEuler: function ( euler ) {
if ( (euler && euler.isEuler) === false ) {
if ( ( euler && euler.isEuler ) === false ) {
console.error( 'THREE.Matrix: .makeRotationFromEuler() now expects a Euler rotation rather than a Vector3 and order.' );
......@@ -3729,21 +3731,6 @@
},
multiplyToArray: function ( a, b, r ) {
var te = this.elements;
this.multiplyMatrices( a, b );
r[ 0 ] = te[ 0 ]; r[ 1 ] = te[ 1 ]; r[ 2 ] = te[ 2 ]; r[ 3 ] = te[ 3 ];
r[ 4 ] = te[ 4 ]; r[ 5 ] = te[ 5 ]; r[ 6 ] = te[ 6 ]; r[ 7 ] = te[ 7 ];
r[ 8 ] = te[ 8 ]; r[ 9 ] = te[ 9 ]; r[ 10 ] = te[ 10 ]; r[ 11 ] = te[ 11 ];
r[ 12 ] = te[ 12 ]; r[ 13 ] = te[ 13 ]; r[ 14 ] = te[ 14 ]; r[ 15 ] = te[ 15 ];
return this;
},
multiplyScalar: function ( s ) {
var te = this.elements;
......@@ -8391,15 +8378,10 @@
copy: function ( m ) {
var te = this.elements;
var me = m.elements;
this.set(
me[ 0 ], me[ 3 ], me[ 6 ],
me[ 1 ], me[ 4 ], me[ 7 ],
me[ 2 ], me[ 5 ], me[ 8 ]
);
for ( var i = 0; i < 9; i ++ ) te[ i ] = me[ i ];
return this;
......@@ -41857,6 +41839,11 @@
console.warn( 'THREE.Matrix4: .setRotationFromQuaternion() has been renamed to .makeRotationFromQuaternion().' );
return this.makeRotationFromQuaternion( q );
},
multiplyToArray: function () {
console.warn( 'THREE.Matrix4: .multiplyToArray() has been removed.' );
},
multiplyVector3: function ( vector ) {
......
此差异已折叠。
......@@ -3386,7 +3386,10 @@ Object.assign( Matrix4.prototype, {
copy: function ( m ) {
for ( var i = 0; i < 16; i ++ ) this.elements[ i ] = m.elements[ i ];
var te = this.elements;
var me = m.elements;
for ( var i = 0; i < 16; i ++ ) te[ i ] = me[ i ];
return this;
......@@ -3394,8 +3397,7 @@ Object.assign( Matrix4.prototype, {
copyPosition: function ( m ) {
var te = this.elements;
var me = m.elements;
var te = this.elements, me = m.elements;
te[ 12 ] = me[ 12 ];
te[ 13 ] = me[ 13 ];
......@@ -3461,7 +3463,7 @@ Object.assign( Matrix4.prototype, {
makeRotationFromEuler: function ( euler ) {
if ( (euler && euler.isEuler) === false ) {
if ( ( euler && euler.isEuler ) === false ) {
console.error( 'THREE.Matrix: .makeRotationFromEuler() now expects a Euler rotation rather than a Vector3 and order.' );
......@@ -3723,21 +3725,6 @@ Object.assign( Matrix4.prototype, {
},
multiplyToArray: function ( a, b, r ) {
var te = this.elements;
this.multiplyMatrices( a, b );
r[ 0 ] = te[ 0 ]; r[ 1 ] = te[ 1 ]; r[ 2 ] = te[ 2 ]; r[ 3 ] = te[ 3 ];
r[ 4 ] = te[ 4 ]; r[ 5 ] = te[ 5 ]; r[ 6 ] = te[ 6 ]; r[ 7 ] = te[ 7 ];
r[ 8 ] = te[ 8 ]; r[ 9 ] = te[ 9 ]; r[ 10 ] = te[ 10 ]; r[ 11 ] = te[ 11 ];
r[ 12 ] = te[ 12 ]; r[ 13 ] = te[ 13 ]; r[ 14 ] = te[ 14 ]; r[ 15 ] = te[ 15 ];
return this;
},
multiplyScalar: function ( s ) {
var te = this.elements;
......@@ -8385,15 +8372,10 @@ Object.assign( Matrix3.prototype, {
copy: function ( m ) {
var te = this.elements;
var me = m.elements;
this.set(
me[ 0 ], me[ 3 ], me[ 6 ],
me[ 1 ], me[ 4 ], me[ 7 ],
me[ 2 ], me[ 5 ], me[ 8 ]
);
for ( var i = 0; i < 9; i ++ ) te[ i ] = me[ i ];
return this;
......@@ -41851,6 +41833,11 @@ Object.assign( Matrix4.prototype, {
console.warn( 'THREE.Matrix4: .setRotationFromQuaternion() has been renamed to .makeRotationFromQuaternion().' );
return this.makeRotationFromQuaternion( q );
},
multiplyToArray: function () {
console.warn( 'THREE.Matrix4: .multiplyToArray() has been removed.' );
},
multiplyVector3: function ( vector ) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册