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

Updated builds.

上级 20361979
...@@ -207,7 +207,7 @@ THREE.Projector = function () { ...@@ -207,7 +207,7 @@ THREE.Projector = function () {
this.pickingRay = function ( vector, camera ) { this.pickingRay = function ( vector, camera ) {
console.error( 'THREE.Projector: .pickingRay() has been removed.' ); console.error( 'THREE.Projector: .pickingRay() is now raycaster.setFromCamera().' );
}; };
...@@ -3336,6 +3336,12 @@ THREE.Euler.prototype = { ...@@ -3336,6 +3336,12 @@ THREE.Euler.prototype = {
}(), }(),
setFromVector3: function ( v, order ) {
return this.set( v.x, v.y, v.z, order || this._order );
},
reorder: function () { reorder: function () {
// WARNING: this discards revolution information -bhouston // WARNING: this discards revolution information -bhouston
...@@ -3376,6 +3382,20 @@ THREE.Euler.prototype = { ...@@ -3376,6 +3382,20 @@ THREE.Euler.prototype = {
}, },
toVector3: function ( optionalResult ) {
if ( optionalResult ) {
return optionalResult.set( this._x, this._y, this._z );
} else {
return new THREE.Vector3( this._x, this._y, this._z );
}
},
onChange: function ( callback ) { onChange: function ( callback ) {
this.onChangeCallback = callback; this.onChangeCallback = callback;
...@@ -4485,6 +4505,31 @@ THREE.Matrix4.prototype = { ...@@ -4485,6 +4505,31 @@ 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 ] );
return this;
},
makeBasis: function ( xAxis, yAxis, zAxis ) {
this.set(
xAxis.x, yAxis.x, zAxis.x, 0,
xAxis.y, yAxis.y, zAxis.y, 0,
xAxis.z, yAxis.z, zAxis.z, 0,
0, 0, 0, 1
);
return this;
},
extractRotation: function () { extractRotation: function () {
var v1 = new THREE.Vector3(); var v1 = new THREE.Vector3();
......
此差异已折叠。
...@@ -288,12 +288,11 @@ THREE.Euler.prototype = { ...@@ -288,12 +288,11 @@ THREE.Euler.prototype = {
toVector3: function ( optionalResult ) { toVector3: function ( optionalResult ) {
if( optionalResult ) { if ( optionalResult ) {
return optionalResult.set( this._x, this._y, this._z ); return optionalResult.set( this._x, this._y, this._z );
} } else {
else {
return new THREE.Vector3( this._x, this._y, this._z ); return new THREE.Vector3( this._x, this._y, this._z );
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册