|
@@ -2837,7 +2837,7 @@ THREE.WebGLRenderer = function ( parameters ) {
|
|
state.activeTexture( _gl.TEXTURE0 + slot );
|
|
state.activeTexture( _gl.TEXTURE0 + slot );
|
|
state.bindTexture( _gl.TEXTURE_2D, textureProperties.__webglTexture );
|
|
state.bindTexture( _gl.TEXTURE_2D, textureProperties.__webglTexture );
|
|
|
|
|
|
- };
|
|
|
|
|
|
+ }
|
|
|
|
|
|
function clampToMaxSize ( image, maxSize ) {
|
|
function clampToMaxSize ( image, maxSize ) {
|
|
|
|
|
|
@@ -3244,7 +3244,7 @@ THREE.WebGLRenderer = function ( parameters ) {
|
|
|
|
|
|
return _currentRenderTarget;
|
|
return _currentRenderTarget;
|
|
|
|
|
|
- }
|
|
|
|
|
|
+ };
|
|
|
|
|
|
this.setRenderTarget = function ( renderTarget ) {
|
|
this.setRenderTarget = function ( renderTarget ) {
|
|
|
|
|
|
@@ -3337,18 +3337,17 @@ THREE.WebGLRenderer = function ( parameters ) {
|
|
|
|
|
|
var texture = renderTarget.texture;
|
|
var texture = renderTarget.texture;
|
|
|
|
|
|
- if ( texture.format !== THREE.RGBAFormat
|
|
|
|
- && paramThreeToGL( texture.format ) !== _gl.getParameter( _gl.IMPLEMENTATION_COLOR_READ_FORMAT ) ) {
|
|
|
|
|
|
+ if ( texture.format !== THREE.RGBAFormat && paramThreeToGL( texture.format ) !== _gl.getParameter( _gl.IMPLEMENTATION_COLOR_READ_FORMAT ) ) {
|
|
|
|
|
|
console.error( 'THREE.WebGLRenderer.readRenderTargetPixels: renderTarget is not in RGBA or implementation defined format.' );
|
|
console.error( 'THREE.WebGLRenderer.readRenderTargetPixels: renderTarget is not in RGBA or implementation defined format.' );
|
|
return;
|
|
return;
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
- if ( texture.type !== THREE.UnsignedByteType
|
|
|
|
- && paramThreeToGL( texture.type ) !== _gl.getParameter( _gl.IMPLEMENTATION_COLOR_READ_TYPE )
|
|
|
|
- && ! ( texture.type === THREE.FloatType && extensions.get( 'WEBGL_color_buffer_float' ) )
|
|
|
|
- && ! ( texture.type === THREE.HalfFloatType && extensions.get( 'EXT_color_buffer_half_float' ) ) ) {
|
|
|
|
|
|
+ if ( texture.type !== THREE.UnsignedByteType &&
|
|
|
|
+ paramThreeToGL( texture.type ) !== _gl.getParameter( _gl.IMPLEMENTATION_COLOR_READ_TYPE ) &&
|
|
|
|
+ ! ( texture.type === THREE.FloatType && extensions.get( 'WEBGL_color_buffer_float' ) ) &&
|
|
|
|
+ ! ( texture.type === THREE.HalfFloatType && extensions.get( 'EXT_color_buffer_half_float' ) ) ) {
|
|
|
|
|
|
console.error( 'THREE.WebGLRenderer.readRenderTargetPixels: renderTarget is not in UnsignedByteType or implementation defined type.' );
|
|
console.error( 'THREE.WebGLRenderer.readRenderTargetPixels: renderTarget is not in UnsignedByteType or implementation defined type.' );
|
|
return;
|
|
return;
|