Skip to content

fix(weather-editor): remove time of day for lighting templates #2133

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

fix(weather-editor): remove time of day for lighting templates #2133

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f21f041
fix(weather-editor): remove time of day for lighting templates.
Apr 16, 2026
391948c
fix: address AI comment
Apr 16, 2026
69cdd32
fix: address AI nitpick
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
70 changes: 18 additions & 52 deletions src/WeatherEditor/Weather/LightingTemplateWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,59 +159,25 @@ void LightingTemplateWidget::DrawDALCSettings()
{
bool changed = false;

if (ImGui::CollapsingHeader("Basic DALC", ImGuiTreeNodeFlags_DefaultOpen)) {
ImGui::Spacing();
if (WeatherUtils::DrawColorEdit("Specular", settings.dalc.specular))
changed = true;
ImGui::Spacing();
if (WeatherUtils::DrawSliderFloat("Fresnel Power", settings.dalc.fresnelPower))
changed = true;
ImGui::Spacing();
}
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))
changed = true;

if (ImGui::CollapsingHeader("Directional Colors (Time of Day)", ImGuiTreeNodeFlags_DefaultOpen)) {
// Note: The game engine uses X, Y, Z to represent time periods
// We map them to: X=Sunrise/Day, Y=Sunset, Z=Night for TOD display

if (TOD::BeginTODTable("DALCDirectionalTable")) {
TOD::RenderTODHeader();
TOD::DrawTODSeparator();

// Prepare arrays for TOD rendering (map X,Y,Z to Sunrise,Day,Sunset,Night)
float3 maxColors[4];
float3 minColors[4];

// Map X (index 0) to Sunrise and Day
maxColors[TOD::Sunrise] = settings.dalc.directional[0].max;
maxColors[TOD::Day] = settings.dalc.directional[0].max;
minColors[TOD::Sunrise] = settings.dalc.directional[0].min;
minColors[TOD::Day] = settings.dalc.directional[0].min;

// Map Y (index 1) to Sunset
maxColors[TOD::Sunset] = settings.dalc.directional[1].max;
minColors[TOD::Sunset] = settings.dalc.directional[1].min;

// Map Z (index 2) to Night
maxColors[TOD::Night] = settings.dalc.directional[2].max;
minColors[TOD::Night] = settings.dalc.directional[2].min;

if (TOD::DrawTODColorRow("Positive Direction (+)", maxColors)) {
settings.dalc.directional[0].max = maxColors[TOD::Sunrise]; // X from Sunrise
settings.dalc.directional[1].max = maxColors[TOD::Sunset]; // Y from Sunset
settings.dalc.directional[2].max = maxColors[TOD::Night]; // Z from Night
changed = true;
}

if (TOD::DrawTODColorRow("Negative Direction (-)", minColors)) {
settings.dalc.directional[0].min = minColors[TOD::Sunrise]; // X from Sunrise
settings.dalc.directional[1].min = minColors[TOD::Sunset]; // Y from Sunset
settings.dalc.directional[2].min = minColors[TOD::Night]; // Z from Night
changed = true;
}

TOD::EndTODTable();
}
}
ImGui::SeparatorText("Directional Colors");
if ((MatchesSearch("Directional") || MatchesSearch("X+ (Right)")) && WeatherUtils::DrawColorEdit("X+ (Right)", settings.dalc.directional[0].max))
changed = true;
if ((MatchesSearch("Directional") || MatchesSearch("X- (Left)")) && WeatherUtils::DrawColorEdit("X- (Left)", settings.dalc.directional[0].min))
changed = true;
if ((MatchesSearch("Directional") || MatchesSearch("Y+ (Front)")) && WeatherUtils::DrawColorEdit("Y+ (Front)", settings.dalc.directional[1].max))
changed = true;
if ((MatchesSearch("Directional") || MatchesSearch("Y- (Back)")) && WeatherUtils::DrawColorEdit("Y- (Back)", settings.dalc.directional[1].min))
changed = true;
if ((MatchesSearch("Directional") || MatchesSearch("Z+ (Up)")) && WeatherUtils::DrawColorEdit("Z+ (Up)", settings.dalc.directional[2].max))
changed = true;
if ((MatchesSearch("Directional") || MatchesSearch("Z- (Down)")) && WeatherUtils::DrawColorEdit("Z- (Down)", settings.dalc.directional[2].min))
changed = true;
Comment thread
coderabbitai[bot] marked this conversation as resolved.

if (changed && EditorWindow::GetSingleton()->settings.autoApplyChanges) {
ApplyChanges();
Expand Down
Loading