Skip to content

fix(weather-editor): corrected slider behaviour for the lighting template widget #2136

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
davo0411 merged 2 commits into from
Apr 16, 2026
Merged

fix(weather-editor): corrected slider behaviour for the lighting template widget #2136

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
d7508d2
fix: Correct lighting template sliders
Apr 16, 2026
26e2e32
fix: adjust cell lighting to match the new values and fix lost 0
Apr 16, 2026
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
10 changes: 5 additions & 5 deletions src/WeatherEditor/Weather/CellLightingWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ void CellLightingWidget::DrawWidget()
if (ImGui::BeginTabItem("Fog")) {
BeginScrollableContent("##FogScroll");
ImGui::SeparatorText("Fog Distance");
if (WeatherUtils::DrawSliderFloat("Fog Near", settings.fogNear, 0.0f, 10000.0f))
if (WeatherUtils::DrawSliderFloat("Fog Near", settings.fogNear, 0.0f, 163840.0f))
changed = true;
if (WeatherUtils::DrawSliderFloat("Fog Far", settings.fogFar, 0.0f, 50000.0f))
if (WeatherUtils::DrawSliderFloat("Fog Far", settings.fogFar, 0.0f, 163840.0f))
changed = true;

ImGui::SeparatorText("Fog Properties");
Expand Down Expand Up @@ -84,11 +84,11 @@ void CellLightingWidget::DrawWidget()
if (ImGui::BeginTabItem("Advanced")) {
BeginScrollableContent("##AdvancedScroll");
ImGui::SeparatorText("Light Fade Distances");
if (WeatherUtils::DrawSliderFloat("Light Fade Start", settings.lightFadeStart, 0.0f, 10000.0f))
if (WeatherUtils::DrawSliderFloat("Light Fade Start", settings.lightFadeStart, 0.0f, 163840.0f))
changed = true;
if (WeatherUtils::DrawSliderFloat("Light Fade End", settings.lightFadeEnd, 0.0f, 20000.0f))
if (WeatherUtils::DrawSliderFloat("Light Fade End", settings.lightFadeEnd, 0.0f, 163840.0f))
changed = true;
if (WeatherUtils::DrawSliderFloat("Clip Distance", settings.clipDist, 0.0f, 50000.0f))
if (WeatherUtils::DrawSliderFloat("Clip Distance", settings.clipDist, 0.0f, 163840.0f))
changed = true;

ImGui::SeparatorText("Directional Rotation");
Expand Down
22 changes: 11 additions & 11 deletions src/WeatherEditor/Weather/LightingTemplateWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,35 +77,35 @@ void LightingTemplateWidget::DrawBasicSettings()

if (ImGui::CollapsingHeader("Directional Settings", ImGuiTreeNodeFlags_DefaultOpen)) {
ImGui::Spacing();
if (MatchesSearch("Directional XY") && WeatherUtils::DrawSliderFloat("Directional XY", settings.directionalXY))
if (MatchesSearch("Directional XY") && WeatherUtils::DrawSliderFloat("Directional XY", settings.directionalXY, 0.0f, 360.0f))
changed = true;
if (MatchesSearch("Directional XY"))
ImGui::Spacing();
if (MatchesSearch("Directional Z") && WeatherUtils::DrawSliderFloat("Directional Z", settings.directionalZ))
if (MatchesSearch("Directional Z") && WeatherUtils::DrawSliderFloat("Directional Z", settings.directionalZ, 0.0f, 360.0f))
changed = true;
if (MatchesSearch("Directional Z"))
ImGui::Spacing();
if (MatchesSearch("Directional Fade") && WeatherUtils::DrawSliderFloat("Directional Fade", settings.directionalFade))
if (MatchesSearch("Directional Fade") && WeatherUtils::DrawSliderFloat("Directional Fade", settings.directionalFade, 0.0f, 10.0f))
changed = true;
if (MatchesSearch("Directional Fade"))
ImGui::Spacing();
}

if (ImGui::CollapsingHeader("Light Fade", ImGuiTreeNodeFlags_DefaultOpen)) {
ImGui::Spacing();
if (MatchesSearch("Light Fade Start") && WeatherUtils::DrawSliderFloat("Light Fade Start", settings.lightFadeStart))
if (MatchesSearch("Light Fade Start") && WeatherUtils::DrawSliderFloat("Light Fade Start", settings.lightFadeStart, 0.0f, 163840.0f))
changed = true;
if (MatchesSearch("Light Fade Start"))
ImGui::Spacing();
if (MatchesSearch("Light Fade End") && WeatherUtils::DrawSliderFloat("Light Fade End", settings.lightFadeEnd))
if (MatchesSearch("Light Fade End") && WeatherUtils::DrawSliderFloat("Light Fade End", settings.lightFadeEnd, 0.0f, 163840.0f))
changed = true;
if (MatchesSearch("Light Fade End"))
ImGui::Spacing();
}

if (ImGui::CollapsingHeader("Other", ImGuiTreeNodeFlags_DefaultOpen)) {
ImGui::Spacing();
if (MatchesSearch("Clip Distance") && WeatherUtils::DrawSliderFloat("Clip Distance", settings.clipDist))
if (MatchesSearch("Clip Distance") && WeatherUtils::DrawSliderFloat("Clip Distance", settings.clipDist, 0.0f, 163840.0f))
changed = true;
if (MatchesSearch("Clip Distance"))
ImGui::Spacing();
Expand All @@ -131,21 +131,21 @@ void LightingTemplateWidget::DrawFogSettings()
ImGui::Spacing();

ImGui::Spacing();
if (MatchesSearch("Fog Near") && WeatherUtils::DrawSliderFloat("Fog Near", settings.fogNear))
if (MatchesSearch("Fog Near") && WeatherUtils::DrawSliderFloat("Fog Near", settings.fogNear, 0.0f, 163840.0f))
changed = true;
if (MatchesSearch("Fog Near"))
ImGui::Spacing();
if (MatchesSearch("Fog Far") && WeatherUtils::DrawSliderFloat("Fog Far", settings.fogFar))
if (MatchesSearch("Fog Far") && WeatherUtils::DrawSliderFloat("Fog Far", settings.fogFar, 0.0f, 163840.0f))
changed = true;
if (MatchesSearch("Fog Far"))
ImGui::Spacing();

ImGui::Spacing();
if (MatchesSearch("Fog Power") && WeatherUtils::DrawSliderFloat("Fog Power", settings.fogPower))
if (MatchesSearch("Fog Power") && WeatherUtils::DrawSliderFloat("Fog Power", settings.fogPower, 0.0f, 10.0f))
changed = true;
if (MatchesSearch("Fog Power"))
ImGui::Spacing();
if (MatchesSearch("Fog Clamp") && WeatherUtils::DrawSliderFloat("Fog Clamp", settings.fogClamp))
if (MatchesSearch("Fog Clamp") && WeatherUtils::DrawSliderFloat("Fog Clamp", settings.fogClamp, 0.0f, 1.0f))
changed = true;
if (MatchesSearch("Fog Clamp"))
ImGui::Spacing();
Expand All @@ -162,7 +162,7 @@ void LightingTemplateWidget::DrawDALCSettings()
ImGui::SeparatorText("Directional Ambient Lighting (DALC)");
if (MatchesSearch("Specular") && WeatherUtils::DrawColorEdit("Specular", settings.dalc.specular))
changed = true;
if (MatchesSearch("Fresnel Power") && WeatherUtils::DrawSliderFloat("Fresnel Power", settings.dalc.fresnelPower))
if (MatchesSearch("Fresnel Power") && WeatherUtils::DrawSliderFloat("Fresnel Power", settings.dalc.fresnelPower, 0.0f, 10.0f))
changed = true;

ImGui::SeparatorText("Directional Colors");
Expand Down
Loading