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

Renamed Matrix4's copyRotation to extractRotation back. As per @WestLangley suggestion in #3220.

上级 1b51d576
......@@ -3730,6 +3730,13 @@ THREE.Matrix4.prototype = {
},
extractPosition: function ( m ) {
console.warn( 'DEPRECATED: Matrix4\'s .extractPosition() has been renamed to .copyPosition().' );
return this.copyPosition( m );
},
copyPosition: function ( m ) {
var te = this.elements;
......@@ -3743,7 +3750,7 @@ THREE.Matrix4.prototype = {
},
copyRotation: function () {
extractRotation: function () {
var v1 = new THREE.Vector3();
......@@ -4275,20 +4282,6 @@ THREE.Matrix4.prototype = {
},
extractPosition: function ( m ) {
console.warn( 'DEPRECATED: Matrix4\'s .extractPosition() has been renamed to .copyPosition().' );
return this.copyPosition( m );
},
extractRotation: function ( m ) {
console.warn( 'DEPRECATED: Matrix4\'s .extractRotation() has been renamed to .copyRotation().' );
return this.copyRotation( m );
},
translate: function ( v ) {
console.warn( 'DEPRECATED: Matrix4\'s .translate() has been removed.');
......@@ -6025,7 +6018,7 @@ THREE.EventDispatcher.prototype = {
var a, b, c, d;
var precision = raycaster.precision;
object.matrixRotationWorld.copyRotation( object.matrixWorld );
object.matrixRotationWorld.extractRotation( object.matrixWorld );
inverseMatrix.getInverse( object.matrixWorld );
......@@ -6239,7 +6232,7 @@ THREE.Object3D.prototype = {
this.scale.getScaleFromMatrix( this.matrix );
m1.copyRotation( this.matrix );
m1.extractRotation( this.matrix );
if ( this.useQuaternion === true ) {
......
此差异已折叠。
......@@ -68,9 +68,9 @@
Copies the translation component of the supplied matrix *m* into this matrix translation component.
</div>
<h3>.copyRotation( [page:Matrix4 m] ) [page:Matrix4]</h3>
<h3>.extractRotation( [page:Matrix4 m] ) [page:Matrix4]</h3>
<div>
Copies the rotation component of the supplied matrix *m* into this matrix rotation component.
Extracts the rotation of the supplied matrix *m* into this matrix rotation component.
</div>
<h3>.lookAt( [page:Vector3 eye], [page:Vector3 center], [page:Vector3 up], ) [page:Matrix4]</h3>
......
......@@ -63,7 +63,7 @@ THREE.Object3D.prototype = {
this.scale.getScaleFromMatrix( this.matrix );
m1.copyRotation( this.matrix );
m1.extractRotation( this.matrix );
if ( this.useQuaternion === true ) {
......
......@@ -91,7 +91,7 @@
var a, b, c, d;
var precision = raycaster.precision;
object.matrixRotationWorld.copyRotation( object.matrixWorld );
object.matrixRotationWorld.extractRotation( object.matrixWorld );
inverseMatrix.getInverse( object.matrixWorld );
......
......@@ -75,6 +75,13 @@ THREE.Matrix4.prototype = {
},
extractPosition: function ( m ) {
console.warn( 'DEPRECATED: Matrix4\'s .extractPosition() has been renamed to .copyPosition().' );
return this.copyPosition( m );
},
copyPosition: function ( m ) {
var te = this.elements;
......@@ -88,7 +95,7 @@ THREE.Matrix4.prototype = {
},
copyRotation: function () {
extractRotation: function () {
var v1 = new THREE.Vector3();
......@@ -620,20 +627,6 @@ THREE.Matrix4.prototype = {
},
extractPosition: function ( m ) {
console.warn( 'DEPRECATED: Matrix4\'s .extractPosition() has been renamed to .copyPosition().' );
return this.copyPosition( m );
},
extractRotation: function ( m ) {
console.warn( 'DEPRECATED: Matrix4\'s .extractRotation() has been renamed to .copyRotation().' );
return this.copyRotation( m );
},
translate: function ( v ) {
console.warn( 'DEPRECATED: Matrix4\'s .translate() has been removed.');
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册