Skip to content

Fix PBR Emissive with lightmap #13362

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

Merged
merged 3 commits into from
Dec 21, 2022
Merged

Fix PBR Emissive with lightmap #13362

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd5f07c
Fix PBR Emissive with lightmap
sebavan Dec 20, 2022
d2dfd49
f1x
sebavan Dec 20, 2022
9082b8a
...
sebavan Dec 21, 2022
File filter

Filter by extension

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: 5 additions & 3 deletions packages/dev/core/src/Shaders/ShadersInclude/pbrBlockFinalColorComposition.fx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
vec4 finalColor = vec4(
finalAmbient +
finalDiffuse +
#ifndef UNLIT
#ifdef REFLECTION
finalIrradiance +
Expand All @@ -27,7 +25,8 @@ vec4 finalColor = vec4(
subSurfaceOut.finalRefraction +
#endif
#endif
finalEmissive,
finalAmbient +
finalDiffuse,
alpha);

// _____________________________ LightMappping _____________________________________
Expand All @@ -41,6 +40,9 @@ vec4 finalColor = vec4(
#endif
#endif

// _____________________________ EmissiveLight _____________________________________
finalColor.rgb += finalEmissive;

#define CUSTOM_FRAGMENT_BEFORE_FOG

// _____________________________ Finally ___________________________________________
Expand Down