Skip to content

Added support for emissive in standard shader #582

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
adriengivry merged 1 commit into from
Jun 10, 2025
Merged

Added support for emissive in standard shader #582

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions Resources/Engine/Shaders/Standard.ovfx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ uniform vec4 u_Albedo = vec4(1.0);
uniform sampler2D u_AmbientOcclusionMap;
uniform sampler2D u_MaskMap;

uniform sampler2D u_EmissiveMap;
uniform vec3 u_EmissiveColor = vec3(1.0, 1.0, 1.0);
uniform float u_EmissiveIntensity = 0.0;

#if defined(SPECULAR_WORKFLOW)
uniform sampler2D u_SpecularMap;
uniform float u_Specular = 1.0;
Expand Down Expand Up @@ -205,6 +209,9 @@ void main()
pbr = mix(pbr, pbr / (pbr + vec3(1.0)), u_BuiltInToneMapping);
pbr = mix(pbr, pow(pbr, vec3(1.0 / 2.2)), u_BuiltInGammaCorrection);

const vec3 emissive = texture(u_EmissiveMap, texCoords).rgb * u_EmissiveColor * u_EmissiveIntensity;
pbr += emissive;

FRAGMENT_COLOR = vec4(pbr, albedo.a);
#endif
}