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

Updated builds.

上级 822f9c55
...@@ -7729,33 +7729,33 @@ THREE.Object3D.prototype = { ...@@ -7729,33 +7729,33 @@ THREE.Object3D.prototype = {
}, },
getChildByName: function ( name, recursive ) { getChildByName: function ( name ) {
console.warn( 'THREE.Object3D: .getChildByName() has been renamed to .getObjectByName().' ); console.warn( 'THREE.Object3D: .getChildByName() has been renamed to .getObjectByName().' );
return this.getObjectByName( name, recursive ); return this.getObjectByName( name );
}, },
getObjectById: function ( id, recursive ) { getObjectById: function ( id ) {
return this.getObjectByProperty( 'id', id, recursive ); return this.getObjectByProperty( 'id', id );
}, },
getObjectByName: function ( name, recursive ) { getObjectByName: function ( name ) {
return this.getObjectByProperty( 'name', name, recursive ); return this.getObjectByProperty( 'name', name );
}, },
getObjectByProperty: function ( name, value, recursive ) { getObjectByProperty: function ( name, value ) {
if ( this[ name ] === value ) return this; if ( this[ name ] === value ) return this;
for ( var i = 0, l = this.children.length; i < l; i ++ ) { for ( var i = 0, l = this.children.length; i < l; i ++ ) {
var child = this.children[ i ]; var child = this.children[ i ];
var object = child.getObjectByProperty( name, value, recursive ); var object = child.getObjectByProperty( name, value );
if ( object !== undefined ) { if ( object !== undefined ) {
...@@ -11476,10 +11476,17 @@ THREE.Loader.prototype = { ...@@ -11476,10 +11476,17 @@ THREE.Loader.prototype = {
if ( m.transparency ) { if ( m.transparency ) {
console.warn( 'transparency has been renamed to opacity' );
mpars.opacity = m.transparency; mpars.opacity = m.transparency;
} }
if ( m.opacity ) {
mpars.opacity = m.opacity;
}
if ( m.specularCoef ) { if ( m.specularCoef ) {
mpars.shininess = m.specularCoef; mpars.shininess = m.specularCoef;
...@@ -17704,6 +17711,18 @@ THREE.WebGLRenderer = function ( parameters ) { ...@@ -17704,6 +17711,18 @@ THREE.WebGLRenderer = function ( parameters ) {
// //
var glClearColor = function ( r, g, b, a ) {
if ( _premultipliedAlpha === true ) {
r *= a; g *= a; b *= a;
}
_gl.clearColor( r, g, b, a );
};
var setDefaultGLState = function () { var setDefaultGLState = function () {
_gl.clearColor( 0, 0, 0, 1 ); _gl.clearColor( 0, 0, 0, 1 );
...@@ -17723,7 +17742,7 @@ THREE.WebGLRenderer = function ( parameters ) { ...@@ -17723,7 +17742,7 @@ THREE.WebGLRenderer = function ( parameters ) {
_gl.viewport( _viewportX, _viewportY, _viewportWidth, _viewportHeight ); _gl.viewport( _viewportX, _viewportY, _viewportWidth, _viewportHeight );
_gl.clearColor( _clearColor.r, _clearColor.g, _clearColor.b, _clearAlpha ); glClearColor( _clearColor.r, _clearColor.g, _clearColor.b, _clearAlpha );
}; };
...@@ -17987,9 +18006,10 @@ THREE.WebGLRenderer = function ( parameters ) { ...@@ -17987,9 +18006,10 @@ THREE.WebGLRenderer = function ( parameters ) {
this.setClearColor = function ( color, alpha ) { this.setClearColor = function ( color, alpha ) {
_clearColor.set( color ); _clearColor.set( color );
_clearAlpha = alpha !== undefined ? alpha : 1; _clearAlpha = alpha !== undefined ? alpha : 1;
_gl.clearColor( _clearColor.r, _clearColor.g, _clearColor.b, _clearAlpha ); glClearColor( _clearColor.r, _clearColor.g, _clearColor.b, _clearAlpha );
}; };
...@@ -18003,7 +18023,7 @@ THREE.WebGLRenderer = function ( parameters ) { ...@@ -18003,7 +18023,7 @@ THREE.WebGLRenderer = function ( parameters ) {
_clearAlpha = alpha; _clearAlpha = alpha;
_gl.clearColor( _clearColor.r, _clearColor.g, _clearColor.b, _clearAlpha ); glClearColor( _clearColor.r, _clearColor.g, _clearColor.b, _clearAlpha );
}; };
......
此差异已折叠。
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册