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

Merge pull request #101971 from clayjohn/sky-light-size-fix

Browse Source 
Pass angular diameter into light size constants for sky shaders.
This commit is contained in:
Thaddeus Crews
2025-03-11 09:35:09 -05:00
parent 0fb0804546 74989c639e
commit a77a28c029
2 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gles3/rasterizer_scene_gles3.cpp
View File

@@ -708,12 +708,7 @@ void RasterizerSceneGLES3::_setup_sky(const RenderDataGLES3 *p_render_data, cons
sky_light_data.enabled = true; sky_light_data.enabled = true;
float angular_diameter = light_storage->light_get_param(base, RS::LIGHT_PARAM_SIZE); float angular_diameter = light_storage->light_get_param(base, RS::LIGHT_PARAM_SIZE);
if (angular_diameter > 0.0) { sky_light_data.size = Math::deg_to_rad(angular_diameter);
angular_diameter = Math::tan(Math::deg_to_rad(angular_diameter));
} else {
angular_diameter = 0.0;
}
sky_light_data.size = angular_diameter;
sky_globals.directional_light_count++; sky_globals.directional_light_count++;
if (sky_globals.directional_light_count >= sky_globals.max_directional_lights) { if (sky_globals.directional_light_count >= sky_globals.max_directional_lights) {
break; break;

10
servers/rendering/renderer_rd/environment/sky.cpp
View File

@@ -1093,15 +1093,7 @@ void SkyRD::setup_sky(const RenderDataRD *p_render_data, const Size2i p_screen_s
sky_light_data.enabled = true; sky_light_data.enabled = true;
float angular_diameter = light_storage->light_get_param(base, RS::LIGHT_PARAM_SIZE); float angular_diameter = light_storage->light_get_param(base, RS::LIGHT_PARAM_SIZE);
if (angular_diameter > 0.0) { sky_light_data.size = Math::deg_to_rad(angular_diameter);
// I know tan(0) is 0, but let's not risk it with numerical precision.
// Technically this will keep expanding until reaching the sun, but all we care about
// is expanding until we reach the radius of the near plane. There can't be more occluders than that.
angular_diameter = Math::tan(Math::deg_to_rad(angular_diameter));
} else {
angular_diameter = 0.0;
}
sky_light_data.size = angular_diameter;
sky_scene_state.ubo.directional_light_count++; sky_scene_state.ubo.directional_light_count++;
if (sky_scene_state.ubo.directional_light_count >= sky_scene_state.max_directional_lights) { if (sky_scene_state.ubo.directional_light_count >= sky_scene_state.max_directional_lights) {
break; break;