diff --git a/src/renderers/shaders/ShaderChunk.js b/src/renderers/shaders/ShaderChunk.js index c9f881c6c0cf9349461521fe17110e184d262396..f171a197977f0f7a028d9e34d40652ff8f40b45e 100644 --- a/src/renderers/shaders/ShaderChunk.js +++ b/src/renderers/shaders/ShaderChunk.js @@ -84,7 +84,6 @@ import skinning_vertex from './ShaderChunk/skinning_vertex.glsl.js'; import skinnormal_vertex from './ShaderChunk/skinnormal_vertex.glsl.js'; import specularmap_fragment from './ShaderChunk/specularmap_fragment.glsl.js'; import specularmap_pars_fragment from './ShaderChunk/specularmap_pars_fragment.glsl.js'; -import transparent_fragment from './ShaderChunk/transparent_fragment.glsl.js'; import tonemapping_fragment from './ShaderChunk/tonemapping_fragment.glsl.js'; import tonemapping_pars_fragment from './ShaderChunk/tonemapping_pars_fragment.glsl.js'; import uv_pars_fragment from './ShaderChunk/uv_pars_fragment.glsl.js'; @@ -215,7 +214,6 @@ export var ShaderChunk = { skinnormal_vertex: skinnormal_vertex, specularmap_fragment: specularmap_fragment, specularmap_pars_fragment: specularmap_pars_fragment, - transparent_fragment: transparent_fragment, tonemapping_fragment: tonemapping_fragment, tonemapping_pars_fragment: tonemapping_pars_fragment, uv_pars_fragment: uv_pars_fragment, diff --git a/src/renderers/shaders/ShaderChunk/alphatest_fragment.glsl.js b/src/renderers/shaders/ShaderChunk/alphatest_fragment.glsl.js index 5ad0429f687fda67bf9fea6f2bcd93bb161fec21..ad0a678090f56739777c76d9cd77184ebcf7cbcd 100644 --- a/src/renderers/shaders/ShaderChunk/alphatest_fragment.glsl.js +++ b/src/renderers/shaders/ShaderChunk/alphatest_fragment.glsl.js @@ -2,6 +2,7 @@ export default /* glsl */` #ifdef ALPHATEST if ( diffuseColor.a < ALPHATEST ) discard; + diffuseColor.a = 1.0; #endif `; diff --git a/src/renderers/shaders/ShaderChunk/transparent_fragment.glsl.js b/src/renderers/shaders/ShaderChunk/transparent_fragment.glsl.js deleted file mode 100644 index 3ac5cf959c7f129c5ed53508d28259b92e6ee1c5..0000000000000000000000000000000000000000 --- a/src/renderers/shaders/ShaderChunk/transparent_fragment.glsl.js +++ /dev/null @@ -1,7 +0,0 @@ -export default /* glsl */` -#ifndef TRANSPARENT - - diffuseColor.a = 1.0; - -#endif -`; diff --git a/src/renderers/shaders/ShaderLib/meshbasic_frag.glsl.js b/src/renderers/shaders/ShaderLib/meshbasic_frag.glsl.js index f225f8a2a280b32f275cf37ac28b075a02907436..8f9a4bb5121b9071f467a50ef4e12555476f3428 100644 --- a/src/renderers/shaders/ShaderLib/meshbasic_frag.glsl.js +++ b/src/renderers/shaders/ShaderLib/meshbasic_frag.glsl.js @@ -35,14 +35,13 @@ void main() { #include #include #include - #include #include ReflectedLight reflectedLight = ReflectedLight( vec3( 0.0 ), vec3( 0.0 ), vec3( 0.0 ), vec3( 0.0 ) ); // accumulation (baked indirect lighting only) #ifdef USE_LIGHTMAP - + vec4 lightMapTexel= texture2D( lightMap, vUv2 ); reflectedLight.indirectDiffuse += lightMapTexelToLinear( lightMapTexel ).rgb * lightMapIntensity; diff --git a/src/renderers/shaders/ShaderLib/meshlambert_frag.glsl.js b/src/renderers/shaders/ShaderLib/meshlambert_frag.glsl.js index aa89a435a8c23745ce7a3900a0f325696c7ef43f..ddb9bfce6616512d996d164b5d78b91d1fe3a2b9 100644 --- a/src/renderers/shaders/ShaderLib/meshlambert_frag.glsl.js +++ b/src/renderers/shaders/ShaderLib/meshlambert_frag.glsl.js @@ -48,7 +48,6 @@ void main() { #include #include #include - #include #include #include diff --git a/src/renderers/shaders/ShaderLib/meshmatcap_frag.glsl.js b/src/renderers/shaders/ShaderLib/meshmatcap_frag.glsl.js index 8cbb870ad416d3dca73c6217d6d903e6da6e363a..28301e764279e1af416ae5cc01710a906f7148f1 100644 --- a/src/renderers/shaders/ShaderLib/meshmatcap_frag.glsl.js +++ b/src/renderers/shaders/ShaderLib/meshmatcap_frag.glsl.js @@ -34,7 +34,6 @@ void main() { #include #include #include - #include #include #include diff --git a/src/renderers/shaders/ShaderLib/meshphong_frag.glsl.js b/src/renderers/shaders/ShaderLib/meshphong_frag.glsl.js index 1442c540fd3d6d098a84bca628b82a30afd56626..10c82ebc8def302154fc92ac6b5aade4a0871f76 100644 --- a/src/renderers/shaders/ShaderLib/meshphong_frag.glsl.js +++ b/src/renderers/shaders/ShaderLib/meshphong_frag.glsl.js @@ -45,7 +45,6 @@ void main() { #include #include #include - #include #include #include #include diff --git a/src/renderers/shaders/ShaderLib/meshphysical_frag.glsl.js b/src/renderers/shaders/ShaderLib/meshphysical_frag.glsl.js index 9e7e8e7c0ce961731449d39afa1747a423bf4d83..3b3453f47bddb9840e163bd6dc6ae11286426545 100644 --- a/src/renderers/shaders/ShaderLib/meshphysical_frag.glsl.js +++ b/src/renderers/shaders/ShaderLib/meshphysical_frag.glsl.js @@ -85,7 +85,6 @@ void main() { #include #include #include - #include #include #include #include diff --git a/src/renderers/shaders/ShaderLib/meshtoon_frag.glsl.js b/src/renderers/shaders/ShaderLib/meshtoon_frag.glsl.js index 73c90d30b076907dd6aa7cbf7c55ef31cf3953bd..e94bbec93a5ee1652538b61682a1930389c295f9 100644 --- a/src/renderers/shaders/ShaderLib/meshtoon_frag.glsl.js +++ b/src/renderers/shaders/ShaderLib/meshtoon_frag.glsl.js @@ -43,7 +43,6 @@ void main() { #include #include #include - #include #include #include #include diff --git a/src/renderers/shaders/ShaderLib/points_frag.glsl.js b/src/renderers/shaders/ShaderLib/points_frag.glsl.js index 16709225699383ac0179d75b017a82553ce5d65a..46d59bba2ea9245480fe1ebe7157e33e79a9ad32 100644 --- a/src/renderers/shaders/ShaderLib/points_frag.glsl.js +++ b/src/renderers/shaders/ShaderLib/points_frag.glsl.js @@ -20,7 +20,6 @@ void main() { #include #include #include - #include outgoingLight = diffuseColor.rgb; diff --git a/src/renderers/shaders/ShaderLib/sprite_frag.glsl.js b/src/renderers/shaders/ShaderLib/sprite_frag.glsl.js index 9595391a7d6bcfbf15c75a1f3b22b9e186d838f0..5c9c951f21d4818a56b57c6ac53e058bb2ea64cf 100644 --- a/src/renderers/shaders/ShaderLib/sprite_frag.glsl.js +++ b/src/renderers/shaders/ShaderLib/sprite_frag.glsl.js @@ -21,7 +21,6 @@ void main() { #include #include #include - #include outgoingLight = diffuseColor.rgb; diff --git a/src/renderers/webgl/WebGLProgram.js b/src/renderers/webgl/WebGLProgram.js index 6c5e6c71fa92f1246f7b054c83b85ef742c6f6f4..c3bf9529b2aa0790f617f6b7236b563248f58113 100644 --- a/src/renderers/webgl/WebGLProgram.js +++ b/src/renderers/webgl/WebGLProgram.js @@ -623,7 +623,6 @@ function WebGLProgram( renderer, cacheKey, parameters ) { ( parameters.toneMapping !== NoToneMapping ) ? getToneMappingFunction( 'toneMapping', parameters.toneMapping ) : '', parameters.dithering ? '#define DITHERING' : '', - parameters.transparent ? '#define TRANSPARENT' : '', ( parameters.outputEncoding || parameters.mapEncoding || parameters.matcapEncoding || parameters.envMapEncoding || parameters.emissiveMapEncoding || parameters.lightMapEncoding ) ? ShaderChunk[ 'encodings_pars_fragment' ] : '', // this code is required here because it is used by the various encoding/decoding function defined below diff --git a/src/renderers/webgl/WebGLPrograms.js b/src/renderers/webgl/WebGLPrograms.js index e11235a079d4b85b1f1b776b552bacef7402728e..ca3651dadc2df49f03a048afb04380fee4224cdc 100644 --- a/src/renderers/webgl/WebGLPrograms.js +++ b/src/renderers/webgl/WebGLPrograms.js @@ -49,7 +49,7 @@ function WebGLPrograms( renderer, extensions, capabilities ) { "numDirLightShadows", "numPointLightShadows", "numSpotLightShadows", "shadowMapEnabled", "shadowMapType", "toneMapping", 'physicallyCorrectLights', "alphaTest", "doubleSided", "flipSided", "numClippingPlanes", "numClipIntersection", "depthPacking", "dithering", - "sheen", "transparent" + "sheen" ]; function getShaderObject( material, shaderID ) { @@ -260,7 +260,6 @@ function WebGLPrograms( renderer, extensions, capabilities ) { numClipIntersection: nClipIntersection, dithering: material.dithering, - transparent: material.transparent, shadowMapEnabled: renderer.shadowMap.enabled && shadows.length > 0, shadowMapType: renderer.shadowMap.type,