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

Updated builds.

上级 6b23f530
......@@ -3887,7 +3887,7 @@ THREE.Box2.prototype = {
},
empty: function () {
isEmpty: function () {
// this is a more robust check for empty than ( volume <= 0 ) because volume can get positive with two negative axes
......@@ -4171,7 +4171,7 @@ THREE.Box3.prototype = {
},
empty: function () {
isEmpty: function () {
// this is a more robust check for empty than ( volume <= 0 ) because volume can get positive with two negative axes
......@@ -4304,7 +4304,7 @@ THREE.Box3.prototype = {
var min, max;
if( plane.normal.x > 0 ) {
if ( plane.normal.x > 0 ) {
min = plane.normal.x * this.min.x;
max = plane.normal.x * this.max.x;
......@@ -4316,7 +4316,7 @@ THREE.Box3.prototype = {
}
if( plane.normal.y > 0 ) {
if ( plane.normal.y > 0 ) {
min += plane.normal.y * this.min.y;
max += plane.normal.y * this.max.y;
......@@ -4328,7 +4328,7 @@ THREE.Box3.prototype = {
}
if( plane.normal.z > 0 ) {
if ( plane.normal.z > 0 ) {
min += plane.normal.z * this.min.z;
max += plane.normal.z * this.max.z;
......@@ -30904,15 +30904,20 @@ THREE.WebGLState = function ( gl, extensions, paramThreeToGL ) {
this.setBlending = function ( blending, blendEquation, blendSrc, blendDst, blendEquationAlpha, blendSrcAlpha, blendDstAlpha ) {
if ( blending !== currentBlending ) {
if ( blending === THREE.NoBlending ) {
if ( blending === THREE.NoBlending ) {
this.disable( gl.BLEND );
} else {
this.disable( gl.BLEND );
this.enable( gl.BLEND );
}
if ( blending !== currentBlending ) {
} else if ( blending === THREE.AdditiveBlending ) {
if ( blending === THREE.AdditiveBlending ) {
this.enable( gl.BLEND );
gl.blendEquation( gl.FUNC_ADD );
gl.blendFunc( gl.SRC_ALPHA, gl.ONE );
......@@ -30920,7 +30925,6 @@ THREE.WebGLState = function ( gl, extensions, paramThreeToGL ) {
// TODO: Find blendFuncSeparate() combination
this.enable( gl.BLEND );
gl.blendEquation( gl.FUNC_ADD );
gl.blendFunc( gl.ZERO, gl.ONE_MINUS_SRC_COLOR );
......@@ -30928,17 +30932,11 @@ THREE.WebGLState = function ( gl, extensions, paramThreeToGL ) {
// TODO: Find blendFuncSeparate() combination
this.enable( gl.BLEND );
gl.blendEquation( gl.FUNC_ADD );
gl.blendFunc( gl.ZERO, gl.SRC_COLOR );
} else if ( blending === THREE.CustomBlending ) {
this.enable( gl.BLEND );
} else {
this.enable( gl.BLEND );
gl.blendEquationSeparate( gl.FUNC_ADD, gl.FUNC_ADD );
gl.blendFuncSeparate( gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA, gl.ONE, gl.ONE_MINUS_SRC_ALPHA );
......@@ -32121,6 +32119,12 @@ THREE.SpritePlugin = function ( renderer, sprites ) {
*/
Object.defineProperties( THREE.Box2.prototype, {
empty: {
value: function () {
console.warn( 'THREE.Box2: .empty() has been renamed to .isEmpty().' );
return this.isEmpty();
}
},
isIntersectionBox: {
value: function ( box ) {
console.warn( 'THREE.Box2: .isIntersectionBox() has been renamed to .intersectsBox().' );
......@@ -32130,6 +32134,12 @@ Object.defineProperties( THREE.Box2.prototype, {
} );
Object.defineProperties( THREE.Box3.prototype, {
empty: {
value: function () {
console.warn( 'THREE.Box3: .empty() has been renamed to .isEmpty().' );
return this.isEmpty();
}
},
isIntersectionBox: {
value: function ( box ) {
console.warn( 'THREE.Box3: .isIntersectionBox() has been renamed to .intersectsBox().' );
......
此差异已折叠。
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册