Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MeshGouraudMaterial: Remove unused lightmap_fragment chunk #28056

Merged
merged 2 commits into from
Apr 18, 2024
Merged

MeshGouraudMaterial: Remove unused lightmap_fragment chunk #28056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c49b2ae
Remove unused lightmap_fragment chunk
pailhead Apr 3, 2024
290bf70
Update MeshGouraudMaterial.js
Mugen87 Apr 18, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion examples/jsm/materials/MeshGouraudMaterial.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,13 @@ const GouraudShader = {

#endif

#include <lightmap_fragment>
mrdoob marked this conversation as resolved.
Show resolved Hide resolved
#ifdef USE_LIGHTMAP

vec4 lightMapTexel = texture2D( lightMap, vLightMapUv );
vec3 lightMapIrradiance = lightMapTexel.rgb * lightMapIntensity;
reflectedLight.indirectDiffuse += lightMapIrradiance;

#endif

reflectedLight.indirectDiffuse *= BRDF_Lambert( diffuseColor.rgb );

Expand Down
2 changes: 0 additions & 2 deletions src/renderers/shaders/ShaderChunk.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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,
Expand Down
10 changes: 0 additions & 10 deletions src/renderers/shaders/ShaderChunk/lightmap_fragment.glsl.js
View file
Open in desktop

This file was deleted.