Skip to content

Commit ae4d9bf

Browse files
mrdoobmrdoob
committed
Updated builds.
1 parent fdc1793 commit ae4d9bf

File tree

2 files changed

+30
-36
lines changed

2 files changed

+30
-36
lines changed

‎build/three.js

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3551,7 +3551,7 @@ THREE.Euler.prototype = {
35513551

35523552
} else {
35533553

3554-
console.warn( 'THREE.Euler: .setFromRotationMatrix() given unsupported order: ' + order )
3554+
console.warn( 'THREE.Euler: .setFromRotationMatrix() given unsupported order: ' + order );
35553555

35563556
}
35573557

@@ -4056,8 +4056,6 @@ THREE.Box3.prototype = {
40564056

40574057
setFromArray: function ( array ) {
40584058

4059-
this.makeEmpty();
4060-
40614059
var minX = + Infinity;
40624060
var minY = + Infinity;
40634061
var minZ = + Infinity;
@@ -4066,7 +4064,7 @@ THREE.Box3.prototype = {
40664064
var maxY = - Infinity;
40674065
var maxZ = - Infinity;
40684066

4069-
for ( var i = 0, il = array.length; i < il; i += 3 ) {
4067+
for ( var i = 0, l = array.length; i < l; i += 3 ) {
40704068

40714069
var x = array[ i ];
40724070
var y = array[ i + 1 ];
@@ -11973,16 +11971,13 @@ THREE.BufferGeometry.prototype = {
1197311971

1197411972
var positions = this.attributes.position.array;
1197511973

11976-
if ( positions ) {
11974+
if ( positions !== undefined ) {
1197711975

1197811976
this.boundingBox.setFromArray( positions );
1197911977

11980-
}
11981-
11982-
if ( positions === undefined || positions.length === 0 ) {
11978+
} else {
1198311979

11984-
this.boundingBox.min.set( 0, 0, 0 );
11985-
this.boundingBox.max.set( 0, 0, 0 );
11980+
this.boundingBox.makeEmpty();
1198611981

1198711982
}
1198811983

@@ -27593,7 +27588,7 @@ THREE.WebGLRenderer = function ( parameters ) {
2759327588
state.activeTexture( _gl.TEXTURE0 + slot );
2759427589
state.bindTexture( _gl.TEXTURE_2D, textureProperties.__webglTexture );
2759527590

27596-
};
27591+
}
2759727592

2759827593
function clampToMaxSize ( image, maxSize ) {
2759927594

@@ -28000,7 +27995,7 @@ THREE.WebGLRenderer = function ( parameters ) {
2800027995

2800127996
return _currentRenderTarget;
2800227997

28003-
}
27998+
};
2800427999

2800528000
this.setRenderTarget = function ( renderTarget ) {
2800628001

@@ -28093,18 +28088,17 @@ THREE.WebGLRenderer = function ( parameters ) {
2809328088

2809428089
var texture = renderTarget.texture;
2809528090

28096-
if ( texture.format !== THREE.RGBAFormat
28097-
&& paramThreeToGL( texture.format ) !== _gl.getParameter( _gl.IMPLEMENTATION_COLOR_READ_FORMAT ) ) {
28091+
if ( texture.format !== THREE.RGBAFormat && paramThreeToGL( texture.format ) !== _gl.getParameter( _gl.IMPLEMENTATION_COLOR_READ_FORMAT ) ) {
2809828092

2809928093
console.error( 'THREE.WebGLRenderer.readRenderTargetPixels: renderTarget is not in RGBA or implementation defined format.' );
2810028094
return;
2810128095

2810228096
}
2810328097

28104-
if ( texture.type !== THREE.UnsignedByteType
28105-
&& paramThreeToGL( texture.type ) !== _gl.getParameter( _gl.IMPLEMENTATION_COLOR_READ_TYPE )
28106-
&& ! ( texture.type === THREE.FloatType && extensions.get( 'WEBGL_color_buffer_float' ) )
28107-
&& ! ( texture.type === THREE.HalfFloatType && extensions.get( 'EXT_color_buffer_half_float' ) ) ) {
28098+
if ( texture.type !== THREE.UnsignedByteType &&
28099+
paramThreeToGL( texture.type ) !== _gl.getParameter( _gl.IMPLEMENTATION_COLOR_READ_TYPE ) &&
28100+
! ( texture.type === THREE.FloatType && extensions.get( 'WEBGL_color_buffer_float' ) ) &&
28101+
! ( texture.type === THREE.HalfFloatType && extensions.get( 'EXT_color_buffer_half_float' ) ) ) {
2810828102

2810928103
console.error( 'THREE.WebGLRenderer.readRenderTargetPixels: renderTarget is not in UnsignedByteType or implementation defined type.' );
2811028104
return;

0 commit comments

Comments
 (0)