Merge pull request #13519 from takahirox/WebGLTextureUpdate

mrdoob · web-flow · commit 99244cd90714 · 2018-03-07T12:44:42.000-08:00
Clean up WebGLTexture
diff --git a/src/renderers/webgl/WebGLTextures.js b/src/renderers/webgl/WebGLTextures.js
@@ -85,9 +85,10 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
 
 		_gl.generateMipmap( target );
 
+		// We assume images for cube map have the same size.
 		var image = Array.isArray( texture.image ) ? texture.image[ 0 ] : texture.image;
 		var textureProperties = properties.get( texture );
-		textureProperties.__maxMipLevel = Math.max( Math.log2( Math.max( image.width, image.height ) ), textureProperties.__maxMipLevel );
+		textureProperties.__maxMipLevel = Math.log2( Math.max( image.width, image.height ) );
 
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -85,9 +85,10 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,`
`85`	`85`
`86`	`86`	`_gl.generateMipmap( target );`
`87`	`87`
	`88`	`+ // We assume images for cube map have the same size.`
`88`	`89`	`var image = Array.isArray( texture.image ) ? texture.image[ 0 ] : texture.image;`
`89`	`90`	`var textureProperties = properties.get( texture );`
`90`		`- textureProperties.__maxMipLevel = Math.max( Math.log2( Math.max( image.width, image.height ) ), textureProperties.__maxMipLevel );`
	`91`	`+ textureProperties.__maxMipLevel = Math.log2( Math.max( image.width, image.height ) );`
`91`	`92`
`92`	`93`	`}`
`93`	`94`