godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-16 14:00:40 +00:00
Code Releases Wiki Activity

Avoid calculating dynamic lights when lights are baked into LightmapGI using the static bake mode

Browse Source
This commit is contained in:
clayjohn
2024-09-09 18:33:19 -03:00
parent aa8d9b83f6
commit 9320865796
6 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
servers/rendering/renderer_rd/shaders/forward_clustered/scene_forward_clustered.glsl
View File

@@ -2211,6 +2211,10 @@ void fragment_shader(in SceneData scene_data) {
continue; //not masked
}
if (directional_lights.data[i].bake_mode == LIGHT_BAKE_STATIC && bool(instances.data[instance_index].flags & INSTANCE_FLAGS_USE_LIGHTMAP)) {
continue; // Statically baked light and object uses lightmap, skip
}
#ifdef LIGHT_TRANSMITTANCE_USED
float transmittance_z = transmittance_depth;
#ifndef SHADOWS_DISABLED

8
servers/rendering/renderer_rd/shaders/forward_mobile/scene_forward_mobile.glsl
View File

@@ -1445,6 +1445,10 @@ void main() {
continue; //not masked
}
if (directional_lights.data[i].bake_mode == LIGHT_BAKE_STATIC && bool(instances.data[draw_call.instance_index].flags & INSTANCE_FLAGS_USE_LIGHTMAP)) {
continue; // Statically baked light and object uses lightmap, skip.
}
float shadow = 1.0;
if (directional_lights.data[i].shadow_opacity > 0.001) {
@@ -1560,6 +1564,10 @@ void main() {
continue; //not masked
}
if (directional_lights.data[i].bake_mode == LIGHT_BAKE_STATIC && bool(instances.data[draw_call.instance_index].flags & INSTANCE_FLAGS_USE_LIGHTMAP)) {
continue; // Statically baked light and object uses lightmap, skip.
}
// We're not doing light transmittence
float shadow = 1.0;