Skip to content

Commit 69310cc

Browse files
Mugen87mrdoob
authored andcommitted
WebGLRenderer: Clean up (mrdoob#8669)
1 parent d7e1963 commit 69310cc

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

src/renderers/WebGLRenderer.js

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2837,7 +2837,7 @@ THREE.WebGLRenderer = function ( parameters ) {
28372837
state.activeTexture( _gl.TEXTURE0 + slot );
28382838
state.bindTexture( _gl.TEXTURE_2D, textureProperties.__webglTexture );
28392839

2840-
};
2840+
}
28412841

28422842
function clampToMaxSize ( image, maxSize ) {
28432843

@@ -3244,7 +3244,7 @@ THREE.WebGLRenderer = function ( parameters ) {
32443244

32453245
return _currentRenderTarget;
32463246

3247-
}
3247+
};
32483248

32493249
this.setRenderTarget = function ( renderTarget ) {
32503250

@@ -3337,18 +3337,17 @@ THREE.WebGLRenderer = function ( parameters ) {
33373337

33383338
var texture = renderTarget.texture;
33393339

3340-
if ( texture.format !== THREE.RGBAFormat
3341-
&& paramThreeToGL( texture.format ) !== _gl.getParameter( _gl.IMPLEMENTATION_COLOR_READ_FORMAT ) ) {
3340+
if ( texture.format !== THREE.RGBAFormat && paramThreeToGL( texture.format ) !== _gl.getParameter( _gl.IMPLEMENTATION_COLOR_READ_FORMAT ) ) {
33423341

33433342
console.error( 'THREE.WebGLRenderer.readRenderTargetPixels: renderTarget is not in RGBA or implementation defined format.' );
33443343
return;
33453344

33463345
}
33473346

3348-
if ( texture.type !== THREE.UnsignedByteType
3349-
&& paramThreeToGL( texture.type ) !== _gl.getParameter( _gl.IMPLEMENTATION_COLOR_READ_TYPE )
3350-
&& ! ( texture.type === THREE.FloatType && extensions.get( 'WEBGL_color_buffer_float' ) )
3351-
&& ! ( texture.type === THREE.HalfFloatType && extensions.get( 'EXT_color_buffer_half_float' ) ) ) {
3347+
if ( texture.type !== THREE.UnsignedByteType &&
3348+
paramThreeToGL( texture.type ) !== _gl.getParameter( _gl.IMPLEMENTATION_COLOR_READ_TYPE ) &&
3349+
! ( texture.type === THREE.FloatType && extensions.get( 'WEBGL_color_buffer_float' ) ) &&
3350+
! ( texture.type === THREE.HalfFloatType && extensions.get( 'EXT_color_buffer_half_float' ) ) ) {
33523351

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

0 commit comments

Comments
 (0)