Skip to content

fix(weather-editor): reinit weathers for record changes #2174

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 9 commits into from
Apr 22, 2026
Merged

fix(weather-editor): reinit weathers for record changes #2174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
95c3de0
fix: reapply wetahers after certain changes
Apr 21, 2026
c89ed71
chore: extend fix to reference and precipitation widgets.
Apr 21, 2026
ebeb716
Merge branch 'dev' into WE-WW-particle-selection
SkrubbySkrubInAShrub Apr 21, 2026
dc548d2
style: 🎨 apply pre-commit.ci formatting
pre-commit-ci[bot] Apr 21, 2026
8e26454
chore: address AI comments and sue globals
Apr 21, 2026
75835bd
fix: address more comments.
Apr 21, 2026
e649a01
chore: move clouds to this function too.
Apr 21, 2026
acdd260
fix: AI comments
Apr 21, 2026
0bf4381
fix: AI comments
Apr 21, 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
5 changes: 1 addition & 4 deletions src/WeatherEditor/Weather/PrecipitationWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,6 @@ void PrecipitationWidget::DrawWidget()

ImGui::EndTabBar();
}

if (changed && EditorWindow::GetSingleton()->settings.autoApplyChanges) {
ApplyChanges();
}
}
ImGui::End();
}
Expand Down Expand Up @@ -226,6 +222,7 @@ void PrecipitationWidget::ApplyChanges()
runtime.data[(uint32_t)RE::BGSShaderParticleGeometryData::DataID::kParticleDensity].f = settings.particleDensity;
runtime.particleTexture.textureName = settings.particleTexture.c_str();
ApplyLiveParticleTexture(settings.particleTexture);
Widget::ForceCurrentWeatherReinit();
}

void PrecipitationWidget::ApplyLiveParticleTexture(const std::string& path)
Expand Down
1 change: 1 addition & 0 deletions src/WeatherEditor/Weather/PrecipitationWidget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class PrecipitationWidget : public Widget

void DrawWidget() override;
const char* GetWidgetTypeName() const override { return "Precipitation"; }
bool RequiresManualApply() const override { return true; }
void LoadSettings() override;
void SaveSettings() override;
void ApplyChanges() override;
Expand Down
7 changes: 2 additions & 5 deletions src/WeatherEditor/Weather/ReferenceEffectWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@ void ReferenceEffectWidget::DrawWidget()
changed = true;
if (ImGui::Checkbox("Inherit Rotation", &settings.inheritRotation))
changed = true;

if (changed && editorWindow->settings.autoApplyChanges) {
editorWindow->PushUndoState(this);
ApplyChanges();
}
}
EndScrollableContent();
}
Expand Down Expand Up @@ -126,6 +121,8 @@ void ReferenceEffectWidget::ApplyChanges()
referenceEffect->data.flags.set(RE::BGSReferenceEffect::Flag::kAttachToCamera);
if (settings.inheritRotation)
referenceEffect->data.flags.set(RE::BGSReferenceEffect::Flag::kInheritRotation);

Widget::ForceCurrentWeatherReinit();
}

void ReferenceEffectWidget::RevertChanges()
Expand Down
1 change: 1 addition & 0 deletions src/WeatherEditor/Weather/ReferenceEffectWidget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ class ReferenceEffectWidget : public Widget

void DrawWidget() override;
const char* GetWidgetTypeName() const override { return "Visual Effect"; }
bool RequiresManualApply() const override { return true; }
void LoadSettings() override;
void SaveSettings() override;
void ApplyChanges() override;
Expand Down
34 changes: 18 additions & 16 deletions src/WeatherEditor/Weather/WeatherWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,6 @@ void WeatherWidget::DrawWidget()
ImGui::Spacing();
auto* editorWindow = EditorWindow::GetSingleton();

bool recordChanged = false;
bool hasParent = editorWindow->settings.enableInheritFromParent && HasParent();
WeatherWidget* parentWidget = hasParent ? GetParent() : nullptr;
const float todLabelOffset = (hasParent ? 120.0f : 100.0f) * scale;
Expand All @@ -245,7 +244,7 @@ void WeatherWidget::DrawWidget()
if (inheritFlag && parentWidget) {
if (settings.imageSpaceRefs[i] != parentWidget->settings.imageSpaceRefs[i]) {
settings.imageSpaceRefs[i] = parentWidget->settings.imageSpaceRefs[i];
recordChanged = true;
pendingReinit = true;
}
}
if (ImGui::IsItemHovered()) {
Expand All @@ -257,7 +256,7 @@ void WeatherWidget::DrawWidget()
ImGui::Text("%s:", label.c_str());
ImGui::SameLine(todLabelOffset);
if (WeatherUtils::DrawFormPickerCached("##ImageSpace", settings.imageSpaceRefs[i], editorWindow->imageSpaceWidgets, false, true, pickerWidth)) {
recordChanged = true;
pendingReinit = true;
} // Add "Open" button
if (settings.imageSpaceRefs[i]) {
ImGui::SameLine();
Expand Down Expand Up @@ -293,7 +292,7 @@ void WeatherWidget::DrawWidget()
if (inheritFlag && parentWidget) {
if (settings.volumetricLightingRefs[i] != parentWidget->settings.volumetricLightingRefs[i]) {
settings.volumetricLightingRefs[i] = parentWidget->settings.volumetricLightingRefs[i];
recordChanged = true;
pendingReinit = true;
}
}
if (ImGui::IsItemHovered()) {
Expand All @@ -305,7 +304,7 @@ void WeatherWidget::DrawWidget()
ImGui::Text("%s:", label.c_str());
ImGui::SameLine(todLabelOffset);
if (WeatherUtils::DrawFormPickerCached("##VolumetricLighting", settings.volumetricLightingRefs[i], editorWindow->volumetricLightingWidgets, false, true, pickerWidth)) {
recordChanged = true;
pendingReinit = true;
} // Add "Open" button
if (settings.volumetricLightingRefs[i]) {
ImGui::SameLine();
Expand Down Expand Up @@ -336,7 +335,7 @@ void WeatherWidget::DrawWidget()
if (inheritFlag && parentWidget) {
if (settings.precipitationData != parentWidget->settings.precipitationData) {
settings.precipitationData = parentWidget->settings.precipitationData;
recordChanged = true;
pendingReinit = true;
}
}
if (ImGui::IsItemHovered()) {
Expand All @@ -348,7 +347,7 @@ void WeatherWidget::DrawWidget()
ImGui::Text("Particle Shader:");
ImGui::SameLine(formLabelOffset);
if (WeatherUtils::DrawFormPickerCached("##Precipitation", settings.precipitationData, editorWindow->precipitationWidgets, false, true, pickerWidth)) {
recordChanged = true;
pendingReinit = true;
} // Add "Open" button
if (settings.precipitationData) {
ImGui::SameLine();
Expand Down Expand Up @@ -377,7 +376,7 @@ void WeatherWidget::DrawWidget()
if (inheritFlag && parentWidget) {
if (settings.referenceEffect != parentWidget->settings.referenceEffect) {
settings.referenceEffect = parentWidget->settings.referenceEffect;
recordChanged = true;
pendingReinit = true;
}
}
if (ImGui::IsItemHovered()) {
Expand All @@ -389,7 +388,7 @@ void WeatherWidget::DrawWidget()
ImGui::Text("Reference Effect:");
ImGui::SameLine(formLabelOffset);
if (WeatherUtils::DrawFormPickerCached("##ReferenceEffect", settings.referenceEffect, editorWindow->referenceEffectWidgets, false, true, pickerWidth)) {
recordChanged = true;
pendingReinit = true;
} // Add "Open" button
if (settings.referenceEffect) {
ImGui::SameLine();
Expand All @@ -409,7 +408,7 @@ void WeatherWidget::DrawWidget()
ImGui::Spacing();
}

if (recordChanged && EditorWindow::GetSingleton()->settings.autoApplyChanges) {
if (pendingReinit) {
ApplyChanges();
}

Expand Down Expand Up @@ -495,6 +494,7 @@ void WeatherWidget::LoadSettings()
LoadFeatureSettings();
}
originalSettings = settings;
pendingReinit = true;
ApplyChanges();
}

Expand Down Expand Up @@ -1175,12 +1175,8 @@ void WeatherWidget::DrawCloudSettings()
if (enableChanged) {
// Apply enable/disable immediately for instant feedback, regardless of autoApplyChanges.
editorWindow->PushUndoState(this);
pendingReinit = true;
ApplyChanges();
if (editorWindow->IsWeatherLocked() && editorWindow->GetLockedWeather() == weather) {
if (auto sky = RE::Sky::GetSingleton()) {
sky->ForceWeather(weather, true); // override=true for immediate application; matches "instant feedback" intent above
}
}
} else if (changed && editorWindow->settings.autoApplyChanges) {
editorWindow->PushUndoState(this);
ApplyChanges();
Expand Down Expand Up @@ -1535,7 +1531,8 @@ void WeatherWidget::InheritAllFromParent()
settings.inheritFlags["Precipitation"] = true;
settings.inheritFlags["ReferenceEffect"] = true;

// Apply the changes
// Apply the changes — form references require a weather reinit to propagate
pendingReinit = true;
if (EditorWindow::GetSingleton()->settings.autoApplyChanges) {
ApplyChanges();
}
Expand Down Expand Up @@ -1657,6 +1654,10 @@ void WeatherWidget::LoadFeatureSettings()
void WeatherWidget::ApplyChanges()
{
SetWeatherValues();
if (pendingReinit) {
Widget::ForceWeatherReinit(weather);
pendingReinit = false;
}
}

void WeatherWidget::RevertChanges()
Expand Down Expand Up @@ -1684,6 +1685,7 @@ void WeatherWidget::RevertChanges()

weatherManager->ClearAllFeatureSettingsForWeather(weather);
settings = vanillaSettings;
pendingReinit = true;
ApplyChanges();
}

Expand Down
1 change: 1 addition & 0 deletions src/WeatherEditor/Weather/WeatherWidget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,4 +152,5 @@ class WeatherWidget : public Widget
void DrawProperties(std::string category, std::map<std::string, int> properties);
void InheritFromParent(const std::string& property);
void InheritAllFromParent();
bool pendingReinit = false;
};
36 changes: 33 additions & 3 deletions src/WeatherEditor/Widget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,20 @@ bool Widget::BeginWidgetWindow()
return result;
}

void Widget::ForceWeatherReinit(RE::TESWeather* weather)
{
auto* sky = globals::game::sky;
if (weather && sky && sky->currentWeather == weather)
sky->ForceWeather(weather, true);
}

void Widget::ForceCurrentWeatherReinit()
{
auto* sky = globals::game::sky;
if (sky && sky->currentWeather)
sky->ForceWeather(sky->currentWeather, true);
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.

void Widget::DrawWidgetHeader(const char* searchId, bool showApply, bool showSaveLoadRevert, bool showForceWeather, RE::TESWeather* weather)
{
auto editorWindow = EditorWindow::GetSingleton();
Expand Down Expand Up @@ -348,8 +362,17 @@ void Widget::DrawWidgetHeader(const char* searchId, bool showApply, bool showSav
};

// Apply button
if (showApply && !editorWindow->settings.autoApplyChanges)
iconButton("_Apply", menu->uiIcons.applyToGame.texture, "Apply changes to the game", [&]() { ApplyChanges(); });
if (showApply && (!editorWindow->settings.autoApplyChanges || RequiresManualApply())) {
if (menu->uiIcons.applyToGame.texture) {
iconButton("_Apply", menu->uiIcons.applyToGame.texture, "Apply changes to the game", [&]() { ApplyChanges(); });
} else {
ImGui::SameLine();
if (ImGui::Button("Apply"))
ApplyChanges();
if (ImGui::IsItemHovered())
ImGui::SetTooltip("Apply changes to the game");
}
}

// Save/Load/Revert/Delete group
if (showSaveLoadRevert) {
Expand Down Expand Up @@ -415,7 +438,7 @@ void Widget::DrawWidgetHeader(const char* searchId, bool showApply, bool showSav
};

// Apply button
if (showApply && !editorWindow->settings.autoApplyChanges)
if (showApply && (!editorWindow->settings.autoApplyChanges || RequiresManualApply()))
styledTextButton("Apply", palette.SuccessColor, "Apply changes to the game", [&]() { ApplyChanges(); });

// Save/Load/Revert/Delete group
Expand All @@ -433,5 +456,12 @@ void Widget::DrawWidgetHeader(const char* searchId, bool showApply, bool showSav

DrawDeleteConfirmationModal();

if (showApply && RequiresManualApply() && editorWindow->settings.autoApplyChanges && menu) {
ImGui::SameLine();
ImGui::TextColored(menu->GetTheme().StatusPalette.Warning, "(Changes require manual apply)");
if (ImGui::IsItemHovered())
ImGui::SetTooltip("This form type is only re-read by the engine on weather reinit.\nAuto-apply is disabled - use the Apply button.");
}

ImGui::Separator();
}
8 changes: 8 additions & 0 deletions src/WeatherEditor/Widget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,14 @@ class Widget
virtual void RevertChanges() { LoadSettings(); }
virtual bool HasUnsavedChanges() const { return false; }

// Reinitialize weather to apply form refs that are only read at load time.
static void ForceWeatherReinit(RE::TESWeather* weather);
// Reinitialize the current sky weather (use when the specific weather is unknown).
static void ForceCurrentWeatherReinit();

// Override to suppress per-frame auto-apply and show a manual-apply warning in the header.
virtual bool RequiresManualApply() const { return false; }

// Draw common header with search bar and action buttons
void DrawWidgetHeader(const char* searchId, bool showApply = true, bool showSaveLoadRevert = false, bool showForceWeather = false, RE::TESWeather* weather = nullptr);

Expand Down
Loading