|
@@ -161,7 +161,7 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, paramT
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
- if ( (renderTarget && renderTarget.isWebGLRenderTargetCube) ) {
|
|
|
|
|
|
+ if ( renderTarget.isWebGLRenderTargetCube ) {
|
|
|
|
|
|
for ( var i = 0; i < 6; i ++ ) {
|
|
for ( var i = 0; i < 6; i ++ ) {
|
|
|
|
|
|
@@ -428,7 +428,7 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, paramT
|
|
|
|
|
|
var mipmap, mipmaps = texture.mipmaps;
|
|
var mipmap, mipmaps = texture.mipmaps;
|
|
|
|
|
|
- if ( (texture && texture.isDepthTexture) ) {
|
|
|
|
|
|
+ if ( texture.isDepthTexture ) {
|
|
|
|
|
|
// populate depth texture with dummy data
|
|
// populate depth texture with dummy data
|
|
|
|
|
|
@@ -456,7 +456,7 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, paramT
|
|
|
|
|
|
state.texImage2D( _gl.TEXTURE_2D, 0, internalFormat, image.width, image.height, 0, glFormat, glType, null );
|
|
state.texImage2D( _gl.TEXTURE_2D, 0, internalFormat, image.width, image.height, 0, glFormat, glType, null );
|
|
|
|
|
|
- } else if ( (texture && texture.isDataTexture) ) {
|
|
|
|
|
|
+ } else if ( texture.isDataTexture ) {
|
|
|
|
|
|
// use manually created mipmaps if available
|
|
// use manually created mipmaps if available
|
|
// if there are no manual mipmaps
|
|
// if there are no manual mipmaps
|
|
@@ -479,7 +479,7 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, paramT
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
- } else if ( (texture && texture.isCompressedTexture) ) {
|
|
|
|
|
|
+ } else if ( texture.isCompressedTexture ) {
|
|
|
|
|
|
for ( var i = 0, il = mipmaps.length; i < il; i ++ ) {
|
|
for ( var i = 0, il = mipmaps.length; i < il; i ++ ) {
|
|
|
|
|
|
@@ -583,12 +583,12 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, paramT
|
|
// Setup resources for a Depth Texture for a FBO (needs an extension)
|
|
// Setup resources for a Depth Texture for a FBO (needs an extension)
|
|
function setupDepthTexture( framebuffer, renderTarget ) {
|
|
function setupDepthTexture( framebuffer, renderTarget ) {
|
|
|
|
|
|
- var isCube = ( (renderTarget && renderTarget.isWebGLRenderTargetCube) );
|
|
|
|
|
|
+ var isCube = ( renderTarget && renderTarget.isWebGLRenderTargetCube );
|
|
if ( isCube ) throw new Error('Depth Texture with cube render targets is not supported!');
|
|
if ( isCube ) throw new Error('Depth Texture with cube render targets is not supported!');
|
|
|
|
|
|
_gl.bindFramebuffer( _gl.FRAMEBUFFER, framebuffer );
|
|
_gl.bindFramebuffer( _gl.FRAMEBUFFER, framebuffer );
|
|
|
|
|
|
- if ( !( (renderTarget.depthTexture && renderTarget.depthTexture.isDepthTexture) ) ) {
|
|
|
|
|
|
+ if ( !( renderTarget.depthTexture && renderTarget.depthTexture.isDepthTexture ) ) {
|
|
|
|
|
|
throw new Error('renderTarget.depthTexture must be an instance of THREE.DepthTexture');
|
|
throw new Error('renderTarget.depthTexture must be an instance of THREE.DepthTexture');
|
|
|
|
|
|
@@ -628,7 +628,7 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, paramT
|
|
|
|
|
|
var renderTargetProperties = properties.get( renderTarget );
|
|
var renderTargetProperties = properties.get( renderTarget );
|
|
|
|
|
|
- var isCube = ( (renderTarget && renderTarget.isWebGLRenderTargetCube) );
|
|
|
|
|
|
+ var isCube = ( renderTarget.isWebGLRenderTargetCube === true );
|
|
|
|
|
|
if ( renderTarget.depthTexture ) {
|
|
if ( renderTarget.depthTexture ) {
|
|
|
|
|
|
@@ -676,7 +676,7 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, paramT
|
|
|
|
|
|
_infoMemory.textures ++;
|
|
_infoMemory.textures ++;
|
|
|
|
|
|
- var isCube = ( (renderTarget && renderTarget.isWebGLRenderTargetCube) );
|
|
|
|
|
|
+ var isCube = ( renderTarget.isWebGLRenderTargetCube === true );
|
|
var isTargetPowerOfTwo = isPowerOfTwo( renderTarget );
|
|
var isTargetPowerOfTwo = isPowerOfTwo( renderTarget );
|
|
|
|
|
|
// Setup framebuffer
|
|
// Setup framebuffer
|