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

Updated builds.

上级 f35e52b0
......@@ -8166,13 +8166,18 @@
},
getWorldPosition: function ( optionalTarget ) {
getWorldPosition: function ( target ) {
var result = optionalTarget || new Vector3();
if ( target === undefined ) {
console.warn( 'THREE.Object3D: .getWorldPosition() target is now required' );
target = new Vector3();
}
this.updateMatrixWorld( true );
return result.setFromMatrixPosition( this.matrixWorld );
return target.setFromMatrixPosition( this.matrixWorld );
},
......@@ -8181,15 +8186,20 @@
var position = new Vector3();
var scale = new Vector3();
return function getWorldQuaternion( optionalTarget ) {
return function getWorldQuaternion( target ) {
if ( target === undefined ) {
console.warn( 'THREE.Object3D: .getWorldQuaternion() target is now required' );
target = new Quaternion();
var result = optionalTarget || new Quaternion();
}
this.updateMatrixWorld( true );
this.matrixWorld.decompose( position, result, scale );
this.matrixWorld.decompose( position, target, scale );
return result;
return target;
};
......@@ -8199,13 +8209,18 @@
var quaternion = new Quaternion();
return function getWorldRotation( optionalTarget ) {
return function getWorldRotation( target ) {
if ( target === undefined ) {
var result = optionalTarget || new Euler();
console.warn( 'THREE.Object3D: .getWorldRotation() target is now required' );
target = new Euler();
}
this.getWorldQuaternion( quaternion );
return result.setFromQuaternion( quaternion, this.rotation.order, false );
return target.setFromQuaternion( quaternion, this.rotation.order, false );
};
......@@ -8216,15 +8231,20 @@
var position = new Vector3();
var quaternion = new Quaternion();
return function getWorldScale( optionalTarget ) {
return function getWorldScale( target ) {
var result = optionalTarget || new Vector3();
if ( target === undefined ) {
console.warn( 'THREE.Object3D: .getWorldScale() target is now required' );
target = new Vector3();
}
this.updateMatrixWorld( true );
this.matrixWorld.decompose( position, quaternion, result );
this.matrixWorld.decompose( position, quaternion, target );
return result;
return target;
};
......@@ -8234,13 +8254,18 @@
var quaternion = new Quaternion();
return function getWorldDirection( optionalTarget ) {
return function getWorldDirection( target ) {
var result = optionalTarget || new Vector3();
if ( target === undefined ) {
console.warn( 'THREE.Object3D: .getWorldDirection() target is now required' );
target = new Vector3();
}
this.getWorldQuaternion( quaternion );
return result.set( 0, 0, 1 ).applyQuaternion( quaternion );
return target.set( 0, 0, 1 ).applyQuaternion( quaternion );
};
......@@ -8589,13 +8614,18 @@
var quaternion = new Quaternion();
return function getWorldDirection( optionalTarget ) {
return function getWorldDirection( target ) {
var result = optionalTarget || new Vector3();
if ( target === undefined ) {
console.warn( 'THREE.Camera: .getWorldDirection() target is now required' );
target = new Vector3();
}
this.getWorldQuaternion( quaternion );
return result.set( 0, 0, - 1 ).applyQuaternion( quaternion );
return target.set( 0, 0, - 1 ).applyQuaternion( quaternion );
};
此差异已折叠。
......@@ -8160,13 +8160,18 @@ Object3D.prototype = Object.assign( Object.create( EventDispatcher.prototype ),
},
getWorldPosition: function ( optionalTarget ) {
getWorldPosition: function ( target ) {
var result = optionalTarget || new Vector3();
if ( target === undefined ) {
console.warn( 'THREE.Object3D: .getWorldPosition() target is now required' );
target = new Vector3();
}
this.updateMatrixWorld( true );
return result.setFromMatrixPosition( this.matrixWorld );
return target.setFromMatrixPosition( this.matrixWorld );
},
......@@ -8175,15 +8180,20 @@ Object3D.prototype = Object.assign( Object.create( EventDispatcher.prototype ),
var position = new Vector3();
var scale = new Vector3();
return function getWorldQuaternion( optionalTarget ) {
return function getWorldQuaternion( target ) {
if ( target === undefined ) {
console.warn( 'THREE.Object3D: .getWorldQuaternion() target is now required' );
target = new Quaternion();
var result = optionalTarget || new Quaternion();
}
this.updateMatrixWorld( true );
this.matrixWorld.decompose( position, result, scale );
this.matrixWorld.decompose( position, target, scale );
return result;
return target;
};
......@@ -8193,13 +8203,18 @@ Object3D.prototype = Object.assign( Object.create( EventDispatcher.prototype ),
var quaternion = new Quaternion();
return function getWorldRotation( optionalTarget ) {
return function getWorldRotation( target ) {
if ( target === undefined ) {
var result = optionalTarget || new Euler();
console.warn( 'THREE.Object3D: .getWorldRotation() target is now required' );
target = new Euler();
}
this.getWorldQuaternion( quaternion );
return result.setFromQuaternion( quaternion, this.rotation.order, false );
return target.setFromQuaternion( quaternion, this.rotation.order, false );
};
......@@ -8210,15 +8225,20 @@ Object3D.prototype = Object.assign( Object.create( EventDispatcher.prototype ),
var position = new Vector3();
var quaternion = new Quaternion();
return function getWorldScale( optionalTarget ) {
return function getWorldScale( target ) {
var result = optionalTarget || new Vector3();
if ( target === undefined ) {
console.warn( 'THREE.Object3D: .getWorldScale() target is now required' );
target = new Vector3();
}
this.updateMatrixWorld( true );
this.matrixWorld.decompose( position, quaternion, result );
this.matrixWorld.decompose( position, quaternion, target );
return result;
return target;
};
......@@ -8228,13 +8248,18 @@ Object3D.prototype = Object.assign( Object.create( EventDispatcher.prototype ),
var quaternion = new Quaternion();
return function getWorldDirection( optionalTarget ) {
return function getWorldDirection( target ) {
var result = optionalTarget || new Vector3();
if ( target === undefined ) {
console.warn( 'THREE.Object3D: .getWorldDirection() target is now required' );
target = new Vector3();
}
this.getWorldQuaternion( quaternion );
return result.set( 0, 0, 1 ).applyQuaternion( quaternion );
return target.set( 0, 0, 1 ).applyQuaternion( quaternion );
};
......@@ -8583,13 +8608,18 @@ Camera.prototype = Object.assign( Object.create( Object3D.prototype ), {
var quaternion = new Quaternion();
return function getWorldDirection( optionalTarget ) {
return function getWorldDirection( target ) {
var result = optionalTarget || new Vector3();
if ( target === undefined ) {
console.warn( 'THREE.Camera: .getWorldDirection() target is now required' );
target = new Vector3();
}
this.getWorldQuaternion( quaternion );
return result.set( 0, 0, - 1 ).applyQuaternion( quaternion );
return target.set( 0, 0, - 1 ).applyQuaternion( quaternion );
};
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册