Quellcode durchsuchen

MeshGouraudMaterial: Remove unused lightmap_fragment chunk (#28056)

* Remove unused lightmap_fragment chunk

* Update MeshGouraudMaterial.js

---------

Co-authored-by: Michael Herzog <[email protected]>
Dusan Bosnjak vor 1 Jahr
Ursprung
Commit
84b7b8839f

+ 7 - 1
examples/jsm/materials/MeshGouraudMaterial.js

@@ -270,7 +270,13 @@ const GouraudShader = {
 
 			#endif
 
-			#include <lightmap_fragment>
+			#ifdef USE_LIGHTMAP
+
+				vec4 lightMapTexel = texture2D( lightMap, vLightMapUv );
+				vec3 lightMapIrradiance = lightMapTexel.rgb * lightMapIntensity;
+				reflectedLight.indirectDiffuse += lightMapIrradiance;
+
+			#endif
 
 			reflectedLight.indirectDiffuse *= BRDF_Lambert( diffuseColor.rgb );
 

+ 0 - 2
src/renderers/shaders/ShaderChunk.js

@@ -40,7 +40,6 @@ import fog_pars_vertex from './ShaderChunk/fog_pars_vertex.glsl.js';
 import fog_fragment from './ShaderChunk/fog_fragment.glsl.js';
 import fog_pars_fragment from './ShaderChunk/fog_pars_fragment.glsl.js';
 import gradientmap_pars_fragment from './ShaderChunk/gradientmap_pars_fragment.glsl.js';
-import lightmap_fragment from './ShaderChunk/lightmap_fragment.glsl.js';
 import lightmap_pars_fragment from './ShaderChunk/lightmap_pars_fragment.glsl.js';
 import lights_lambert_fragment from './ShaderChunk/lights_lambert_fragment.glsl.js';
 import lights_lambert_pars_fragment from './ShaderChunk/lights_lambert_pars_fragment.glsl.js';
@@ -169,7 +168,6 @@ export const ShaderChunk = {
 	fog_fragment: fog_fragment,
 	fog_pars_fragment: fog_pars_fragment,
 	gradientmap_pars_fragment: gradientmap_pars_fragment,
-	lightmap_fragment: lightmap_fragment,
 	lightmap_pars_fragment: lightmap_pars_fragment,
 	lights_lambert_fragment: lights_lambert_fragment,
 	lights_lambert_pars_fragment: lights_lambert_pars_fragment,

+ 0 - 10
src/renderers/shaders/ShaderChunk/lightmap_fragment.glsl.js

@@ -1,10 +0,0 @@
-export default /* glsl */`
-#ifdef USE_LIGHTMAP
-
-	vec4 lightMapTexel = texture2D( lightMap, vLightMapUv );
-	vec3 lightMapIrradiance = lightMapTexel.rgb * lightMapIntensity;
-
-	reflectedLight.indirectDiffuse += lightMapIrradiance;
-
-#endif
-`;