Browse Source

Reverted prev changes, simplified bug fix by changing use of TEXTURE_LOD_EXT

Daniel Sturk 6 years ago
parent
commit
6a69bb419f

+ 2 - 9
examples/jsm/nodes/inputs/CubeTextureNode.js

@@ -47,15 +47,8 @@ CubeTextureNode.prototype.generate = function ( builder, output ) {
 
 	var code;
 
-	if ( bias ) {
-
-		var renderer = builder.renderer;
-		var texLodExtension = renderer.capabilities.isWebGL2 || renderer.extensions.get( 'EXT_shader_texture_lod' ); // copied from WebGLProgram
-
-		if(texLodExtension) code = 'textureCubeLodEXT( ' + cubetex + ', ' + uv + ', ' + bias + ' )';
-		else code = 'texCubeBias( ' + cubetex + ', ' + uv + ', ' + bias + ' )';
-
-	} else code = 'texCube( ' + cubetex + ', ' + uv + ' )';
+	if ( bias ) code = 'texCubeBias( ' + cubetex + ', ' + uv + ', ' + bias + ' )';
+	else code = 'texCube( ' + cubetex + ', ' + uv + ' )';
 
 	// add a custom context for fix incompatibility with the core
 	// include ColorSpace function only for vertex shader (in fragment shader color space functions is added automatically by core)

+ 1 - 1
src/renderers/webgl/WebGLProgram.js

@@ -525,7 +525,7 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters,
 			parameters.logarithmicDepthBuffer ? '#define USE_LOGDEPTHBUF' : '',
 			parameters.logarithmicDepthBuffer && ( capabilities.isWebGL2 || extensions.get( 'EXT_frag_depth' ) ) ? '#define USE_LOGDEPTHBUF_EXT' : '',
 
-			parameters.envMap && ( capabilities.isWebGL2 || extensions.get( 'EXT_shader_texture_lod' ) ) ? '#define TEXTURE_LOD_EXT' : '',
+			( capabilities.isWebGL2 || extensions.get( 'EXT_shader_texture_lod' ) ) ? '#define TEXTURE_LOD_EXT' : '',
 
 			'uniform mat4 viewMatrix;',
 			'uniform vec3 cameraPosition;',