Skip to content

refactor(weather-editor): match celllighting to lightingtemplate #2321

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
alandtse merged 1 commit into from
May 12, 2026
Merged

refactor(weather-editor): match celllighting to lightingtemplate #2321

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
175 changes: 107 additions & 68 deletions src/WeatherEditor/Weather/CellLightingWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ namespace
{
namespace CellLightingTab
{
constexpr const char* kColors = "Colors";
constexpr const char* kBasic = "Basic";
constexpr const char* kFog = "Fog";
constexpr const char* kDirectionalAmbient = "Directional Ambient";
constexpr const char* kAdvanced = "Advanced";
constexpr const char* kDalc = "DALC";
constexpr const char* kInheritance = "Inheritance";
}

Expand Down Expand Up @@ -68,69 +67,33 @@ void CellLightingWidget::DrawWidget()
bool changed = false;

if (ImGui::BeginTabBar("CellLightingTabs")) {
const ImGuiTabItemFlags colorsFlags = GetTabFlagsForOverride(CellLightingTab::kColors);
const ImGuiTabItemFlags basicFlags = GetTabFlagsForOverride(CellLightingTab::kBasic);
const ImGuiTabItemFlags fogFlags = GetTabFlagsForOverride(CellLightingTab::kFog);
const ImGuiTabItemFlags dalcFlags = GetTabFlagsForOverride(CellLightingTab::kDirectionalAmbient);
const ImGuiTabItemFlags advancedFlags = GetTabFlagsForOverride(CellLightingTab::kAdvanced);
const ImGuiTabItemFlags dalcFlags = GetTabFlagsForOverride(CellLightingTab::kDalc);
const ImGuiTabItemFlags inheritFlags = GetTabFlagsForOverride(CellLightingTab::kInheritance);
if (ImGui::BeginTabItem(CellLightingTab::kColors, nullptr, colorsFlags)) {
BeginScrollableContent("##ColorsScroll");
if (MatchesAnySearch({ CellLightingSetting::kAmbientColor, CellLightingSetting::kDirectionalColor, CellLightingSetting::kDirectionalFade })) {
ImGui::SeparatorText("Ambient & Directional");
changed |= WeatherUtils::DrawColorEdit(CellLightingSetting::kAmbientColor, settings.ambient);
changed |= WeatherUtils::DrawColorEdit(CellLightingSetting::kDirectionalColor, settings.directional);
changed |= WeatherUtils::DrawSliderFloat(CellLightingSetting::kDirectionalFade, settings.directionalFade, 0.0f, 1.0f);
}
if (MatchesAnySearch({ CellLightingSetting::kFogNearColor, CellLightingSetting::kFogFarColor })) {
ImGui::SeparatorText("Fog Colors");
changed |= WeatherUtils::DrawColorEdit(CellLightingSetting::kFogNearColor, settings.fogColorNear);
changed |= WeatherUtils::DrawColorEdit(CellLightingSetting::kFogFarColor, settings.fogColorFar);
}
EndScrollableContent();
ImGui::EndTabItem();
}

if (ImGui::BeginTabItem(CellLightingTab::kFog, nullptr, fogFlags)) {
BeginScrollableContent("##FogScroll");
if (MatchesAnySearch({ CellLightingSetting::kFogNear, CellLightingSetting::kFogFar })) {
ImGui::SeparatorText("Fog Distance");
changed |= WeatherUtils::DrawSliderFloat(CellLightingSetting::kFogNear, settings.fogNear, 0.0f, 163840.0f);
changed |= WeatherUtils::DrawSliderFloat(CellLightingSetting::kFogFar, settings.fogFar, 0.0f, 163840.0f);
}
if (MatchesAnySearch({ CellLightingSetting::kFogPower, CellLightingSetting::kFogClampMax })) {
ImGui::SeparatorText("Fog Properties");
changed |= WeatherUtils::DrawSliderFloat(CellLightingSetting::kFogPower, settings.fogPower, 0.0f, 10.0f);
changed |= WeatherUtils::DrawSliderFloat(CellLightingSetting::kFogClampMax, settings.fogClamp, 0.0f, 1.0f);
}
EndScrollableContent();
ImGui::EndTabItem();
}
if (ImGui::BeginTabItem(CellLightingTab::kBasic, nullptr, basicFlags)) {
BeginScrollableContent("##BasicScroll");

auto drawMatchedHeader = [&](bool matches, const char* label, auto draw) {
if (!matches)
return;
if (ShouldOpenSearchSection())
ImGui::SetNextItemOpen(true, ImGuiCond_Always);
if (ImGui::CollapsingHeader(label, ImGuiTreeNodeFlags_DefaultOpen)) {
ImGui::Spacing();
draw();
ImGui::Spacing();
}
};

if (ImGui::BeginTabItem(CellLightingTab::kDirectionalAmbient, nullptr, dalcFlags)) {
BeginScrollableContent("##DAmbientScroll");
ImGui::SeparatorText("Directional Ambient Lighting (DALC)");
changed |= WeatherUtils::DrawColorEdit(CellLightingSetting::kXPlus, settings.directionalXPlus);
changed |= WeatherUtils::DrawColorEdit(CellLightingSetting::kXMinus, settings.directionalXMinus);
changed |= WeatherUtils::DrawColorEdit(CellLightingSetting::kYPlus, settings.directionalYPlus);
changed |= WeatherUtils::DrawColorEdit(CellLightingSetting::kYMinus, settings.directionalYMinus);
changed |= WeatherUtils::DrawColorEdit(CellLightingSetting::kZPlus, settings.directionalZPlus);
changed |= WeatherUtils::DrawColorEdit(CellLightingSetting::kZMinus, settings.directionalZMinus);
changed |= WeatherUtils::DrawColorEdit(CellLightingSetting::kSpecular, settings.directionalSpecular);
changed |= WeatherUtils::DrawSliderFloat(CellLightingSetting::kFresnelPower, settings.fresnelPower, 0.0f, 10.0f);
EndScrollableContent();
ImGui::EndTabItem();
}
drawMatchedHeader(MatchesAnySearch({ CellLightingSetting::kAmbientColor, CellLightingSetting::kDirectionalColor }), "Ambient & Directional", [&]() {
changed |= WeatherUtils::DrawColorEdit(CellLightingSetting::kAmbientColor, settings.ambient);
ImGui::Spacing();
changed |= WeatherUtils::DrawColorEdit(CellLightingSetting::kDirectionalColor, settings.directional);
});

if (ImGui::BeginTabItem(CellLightingTab::kAdvanced, nullptr, advancedFlags)) {
BeginScrollableContent("##AdvancedScroll");
if (MatchesAnySearch({ CellLightingSetting::kLightFadeStart, CellLightingSetting::kLightFadeEnd, CellLightingSetting::kClipDistance })) {
ImGui::SeparatorText("Light Fade Distances");
changed |= WeatherUtils::DrawSliderFloat(CellLightingSetting::kLightFadeStart, settings.lightFadeStart, 0.0f, 163840.0f);
changed |= WeatherUtils::DrawSliderFloat(CellLightingSetting::kLightFadeEnd, settings.lightFadeEnd, 0.0f, 163840.0f);
changed |= WeatherUtils::DrawSliderFloat(CellLightingSetting::kClipDistance, settings.clipDist, 0.0f, 163840.0f);
}
if (MatchesAnySearch({ CellLightingSetting::kXYRotation, CellLightingSetting::kZRotation })) {
ImGui::SeparatorText("Directional Rotation");
drawMatchedHeader(MatchesAnySearch({ CellLightingSetting::kXYRotation, CellLightingSetting::kZRotation, CellLightingSetting::kDirectionalFade }), "Directional Settings", [&]() {
int xyDegrees = settings.directionalXY;
int zDegrees = settings.directionalZ;
if (DrawIfMatchesSearch(CellLightingSetting::kXYRotation, [&](const char* label) {
Expand All @@ -141,6 +104,7 @@ void CellLightingWidget::DrawWidget()
settings.directionalXY = static_cast<uint32_t>(xyDegrees);
changed = true;
}
ImGui::Spacing();
if (DrawIfMatchesSearch(CellLightingSetting::kZRotation, [&](const char* label) {
return DrawWithHighlight(label, [&]() {
return ImGui::SliderInt(label, &zDegrees, 0, 360);
Expand All @@ -149,7 +113,81 @@ void CellLightingWidget::DrawWidget()
settings.directionalZ = static_cast<uint32_t>(zDegrees);
changed = true;
}
ImGui::Spacing();
changed |= WeatherUtils::DrawSliderFloat(CellLightingSetting::kDirectionalFade, settings.directionalFade, 0.0f, 1.0f);
});

drawMatchedHeader(MatchesAnySearch({ CellLightingSetting::kLightFadeStart, CellLightingSetting::kLightFadeEnd }), "Light Fade", [&]() {
changed |= WeatherUtils::DrawSliderFloat(CellLightingSetting::kLightFadeStart, settings.lightFadeStart, 0.0f, 163840.0f);
ImGui::Spacing();
changed |= WeatherUtils::DrawSliderFloat(CellLightingSetting::kLightFadeEnd, settings.lightFadeEnd, 0.0f, 163840.0f);
});

drawMatchedHeader(MatchesAnySearch({ CellLightingSetting::kClipDistance }), "Other", [&]() {
changed |= WeatherUtils::DrawSliderFloat(CellLightingSetting::kClipDistance, settings.clipDist, 0.0f, 163840.0f);
});

EndScrollableContent();
ImGui::EndTabItem();
}

if (ImGui::BeginTabItem(CellLightingTab::kFog, nullptr, fogFlags)) {
BeginScrollableContent("##FogScroll");

DrawSearchSectionIfMatches(CellLightingSetting::kFogNearColor, [&](const char*) {
ImGui::Spacing();
changed |= WeatherUtils::DrawColorEdit(CellLightingSetting::kFogNearColor, settings.fogColorNear);
});

DrawSearchSectionIfMatches(CellLightingSetting::kFogFarColor, [&](const char*) {
ImGui::Spacing();
changed |= WeatherUtils::DrawColorEdit(CellLightingSetting::kFogFarColor, settings.fogColorFar);
});

DrawSearchSectionIfMatches(CellLightingSetting::kFogNear, [&](const char*) {
ImGui::Spacing();
changed |= WeatherUtils::DrawSliderFloat(CellLightingSetting::kFogNear, settings.fogNear, 0.0f, 163840.0f);
});

DrawSearchSectionIfMatches(CellLightingSetting::kFogFar, [&](const char*) {
ImGui::Spacing();
changed |= WeatherUtils::DrawSliderFloat(CellLightingSetting::kFogFar, settings.fogFar, 0.0f, 163840.0f);
});

DrawSearchSectionIfMatches(CellLightingSetting::kFogPower, [&](const char*) {
ImGui::Spacing();
changed |= WeatherUtils::DrawSliderFloat(CellLightingSetting::kFogPower, settings.fogPower, 0.0f, 10.0f);
});

DrawSearchSectionIfMatches(CellLightingSetting::kFogClampMax, [&](const char*) {
ImGui::Spacing();
changed |= WeatherUtils::DrawSliderFloat(CellLightingSetting::kFogClampMax, settings.fogClamp, 0.0f, 1.0f);
});

EndScrollableContent();
ImGui::EndTabItem();
}

if (ImGui::BeginTabItem(CellLightingTab::kDalc, nullptr, dalcFlags)) {
BeginScrollableContent("##DALCScroll");

if (MatchesAnySearch({ CellLightingSetting::kSpecular, CellLightingSetting::kFresnelPower })) {
ImGui::SeparatorText("Directional Ambient Lighting (DALC)");
changed |= WeatherUtils::DrawColorEdit(CellLightingSetting::kSpecular, settings.directionalSpecular);
changed |= WeatherUtils::DrawSliderFloat(CellLightingSetting::kFresnelPower, settings.fresnelPower, 0.0f, 10.0f);
}

if (MatchesAnySearch({ CellLightingSetting::kXPlus, CellLightingSetting::kXMinus, CellLightingSetting::kYPlus,
CellLightingSetting::kYMinus, CellLightingSetting::kZPlus, CellLightingSetting::kZMinus })) {
ImGui::SeparatorText("Directional Colors");
changed |= WeatherUtils::DrawColorEdit(CellLightingSetting::kXPlus, settings.directionalXPlus);
changed |= WeatherUtils::DrawColorEdit(CellLightingSetting::kXMinus, settings.directionalXMinus);
changed |= WeatherUtils::DrawColorEdit(CellLightingSetting::kYPlus, settings.directionalYPlus);
changed |= WeatherUtils::DrawColorEdit(CellLightingSetting::kYMinus, settings.directionalYMinus);
changed |= WeatherUtils::DrawColorEdit(CellLightingSetting::kZPlus, settings.directionalZPlus);
changed |= WeatherUtils::DrawColorEdit(CellLightingSetting::kZMinus, settings.directionalZMinus);
}

EndScrollableContent();
ImGui::EndTabItem();
}
Expand Down Expand Up @@ -476,13 +514,14 @@ bool CellLightingWidget::HasUnsavedChanges() const
std::vector<Widget::SearchResult> CellLightingWidget::CollectSearchableSettings() const
{
const std::vector<std::pair<std::string, std::vector<std::string>>> entries = {
{ CellLightingTab::kColors, { CellLightingSetting::kAmbientColor, CellLightingSetting::kDirectionalColor, CellLightingSetting::kDirectionalFade,
CellLightingSetting::kFogNearColor, CellLightingSetting::kFogFarColor } },
{ CellLightingTab::kFog, { CellLightingSetting::kFogNear, CellLightingSetting::kFogFar, CellLightingSetting::kFogPower, CellLightingSetting::kFogClampMax } },
{ CellLightingTab::kDirectionalAmbient, { CellLightingSetting::kXPlus, CellLightingSetting::kXMinus, CellLightingSetting::kYPlus, CellLightingSetting::kYMinus,
CellLightingSetting::kZPlus, CellLightingSetting::kZMinus, CellLightingSetting::kSpecular, CellLightingSetting::kFresnelPower } },
{ CellLightingTab::kAdvanced, { CellLightingSetting::kLightFadeStart, CellLightingSetting::kLightFadeEnd, CellLightingSetting::kClipDistance,
CellLightingSetting::kXYRotation, CellLightingSetting::kZRotation } },
{ CellLightingTab::kBasic, { CellLightingSetting::kAmbientColor, CellLightingSetting::kDirectionalColor,
CellLightingSetting::kXYRotation, CellLightingSetting::kZRotation, CellLightingSetting::kDirectionalFade,
CellLightingSetting::kLightFadeStart, CellLightingSetting::kLightFadeEnd, CellLightingSetting::kClipDistance } },
{ CellLightingTab::kFog, { CellLightingSetting::kFogNearColor, CellLightingSetting::kFogFarColor,
CellLightingSetting::kFogNear, CellLightingSetting::kFogFar, CellLightingSetting::kFogPower, CellLightingSetting::kFogClampMax } },
{ CellLightingTab::kDalc, { CellLightingSetting::kSpecular, CellLightingSetting::kFresnelPower,
CellLightingSetting::kXPlus, CellLightingSetting::kXMinus, CellLightingSetting::kYPlus, CellLightingSetting::kYMinus,
CellLightingSetting::kZPlus, CellLightingSetting::kZMinus } },
{ CellLightingTab::kInheritance, { CellLightingSetting::kInheritAmbientColor, CellLightingSetting::kInheritDirectionalColor, CellLightingSetting::kInheritFogColor,
CellLightingSetting::kInheritFogNear, CellLightingSetting::kInheritFogFar, CellLightingSetting::kInheritDirectionalRotation,
CellLightingSetting::kInheritDirectionalFade, CellLightingSetting::kInheritClipDistance, CellLightingSetting::kInheritFogPower,
Expand Down
Loading