From d2a07d4585bd9338a11ff26f21f524fb494e28a7 Mon Sep 17 00:00:00 2001 From: SkrubbySkrubInAShrub Date: Sun, 19 Apr 2026 12:48:46 +0200 Subject: [PATCH 1/4] chore: clean dead code --- src/WeatherEditor/Weather/WeatherWidget.cpp | 18 ----------- src/WeatherEditor/Weather/WeatherWidget.h | 34 +++------------------ 2 files changed, 5 insertions(+), 47 deletions(-) diff --git a/src/WeatherEditor/Weather/WeatherWidget.cpp b/src/WeatherEditor/Weather/WeatherWidget.cpp index b4316d9d39..551a38e06b 100644 --- a/src/WeatherEditor/Weather/WeatherWidget.cpp +++ b/src/WeatherEditor/Weather/WeatherWidget.cpp @@ -16,22 +16,6 @@ NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(WeatherWidget::DirectionalColor, max, min) NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(WeatherWidget::DALC, specular, fresnelPower, directional) NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(WeatherWidget::Cloud, cloudLayerSpeedY, cloudLayerSpeedX, color, cloudAlpha, enabled, texturePath) -NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(WeatherWidget::ImageSpaceSettings, - hdrEyeAdaptSpeed, - hdrBloomBlurRadius, - hdrBloomThreshold, - hdrBloomScale, - hdrSunlightScale, - hdrSkyScale, - cinematicSaturation, - cinematicBrightness, - cinematicContrast, - tintColor, - tintAmount, - dofStrength, - dofDistance, - dofRange) - NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(WeatherWidget::Settings, parent, inheritFlags, @@ -41,7 +25,6 @@ NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(WeatherWidget::Settings, atmosphereColors, dalc, clouds, - imageSpaces, featureSettings) WeatherWidget::~WeatherWidget() @@ -1660,7 +1643,6 @@ bool WeatherWidget::Settings::operator==(const Settings& o) const std::equal(std::begin(atmosphereColors), std::end(atmosphereColors), std::begin(o.atmosphereColors)) && std::equal(std::begin(dalc), std::end(dalc), std::begin(o.dalc)) && std::equal(std::begin(clouds), std::end(clouds), std::begin(o.clouds)) && - std::equal(std::begin(imageSpaces), std::end(imageSpaces), std::begin(o.imageSpaces)) && featureSettings == o.featureSettings; } diff --git a/src/WeatherEditor/Weather/WeatherWidget.h b/src/WeatherEditor/Weather/WeatherWidget.h index 577ea174f2..302ab1b6c7 100644 --- a/src/WeatherEditor/Weather/WeatherWidget.h +++ b/src/WeatherEditor/Weather/WeatherWidget.h @@ -67,33 +67,6 @@ class WeatherWidget : public Widget } }; - struct ImageSpaceSettings - { - // HDR Settings - float hdrEyeAdaptSpeed = 0.0f; - float hdrBloomBlurRadius = 0.0f; - float hdrBloomThreshold = 0.0f; - float hdrBloomScale = 0.0f; - float hdrSunlightScale = 0.0f; - float hdrSkyScale = 0.0f; - - // Cinematic Settings - float cinematicSaturation = 0.0f; - float cinematicBrightness = 0.0f; - float cinematicContrast = 0.0f; - - // Tint Colors - float3 tintColor = { 1.0f, 1.0f, 1.0f }; - float tintAmount = 0.0f; - - // Depth of Field - float dofStrength = 0.0f; - float dofDistance = 0.0f; - float dofRange = 0.0f; - - bool operator==(const ImageSpaceSettings&) const = default; - }; - struct Settings { std::string parent = "None"; @@ -107,8 +80,11 @@ class WeatherWidget : public Widget DALC dalc[ColorTimes::kTotal]; Cloud clouds[TESWeather::kTotalLayers]; - // ImageSpace settings for each time of day - ImageSpaceSettings imageSpaces[ColorTimes::kTotal]; + // Record form references + RE::TESImageSpace* imageSpaceRefs[ColorTimes::kTotal] = {}; + RE::BGSVolumetricLighting* volumetricLightingRefs[ColorTimes::kTotal] = {}; + RE::BGSShaderParticleGeometryData* precipitationData = nullptr; + RE::BGSReferenceEffect* referenceEffect = nullptr; // Per-feature settings storage std::map featureSettings; From b2d4889f379d5b29fc7f565b0892eb5f6ec1b6be Mon Sep 17 00:00:00 2001 From: SkrubbySkrubInAShrub Date: Sun, 19 Apr 2026 12:51:46 +0200 Subject: [PATCH 2/4] Revert "chore: clean dead code" This reverts commit d2a07d4585bd9338a11ff26f21f524fb494e28a7. --- src/WeatherEditor/Weather/WeatherWidget.cpp | 18 +++++++++++ src/WeatherEditor/Weather/WeatherWidget.h | 34 ++++++++++++++++++--- 2 files changed, 47 insertions(+), 5 deletions(-) diff --git a/src/WeatherEditor/Weather/WeatherWidget.cpp b/src/WeatherEditor/Weather/WeatherWidget.cpp index 551a38e06b..b4316d9d39 100644 --- a/src/WeatherEditor/Weather/WeatherWidget.cpp +++ b/src/WeatherEditor/Weather/WeatherWidget.cpp @@ -16,6 +16,22 @@ NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(WeatherWidget::DirectionalColor, max, min) NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(WeatherWidget::DALC, specular, fresnelPower, directional) NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(WeatherWidget::Cloud, cloudLayerSpeedY, cloudLayerSpeedX, color, cloudAlpha, enabled, texturePath) +NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(WeatherWidget::ImageSpaceSettings, + hdrEyeAdaptSpeed, + hdrBloomBlurRadius, + hdrBloomThreshold, + hdrBloomScale, + hdrSunlightScale, + hdrSkyScale, + cinematicSaturation, + cinematicBrightness, + cinematicContrast, + tintColor, + tintAmount, + dofStrength, + dofDistance, + dofRange) + NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(WeatherWidget::Settings, parent, inheritFlags, @@ -25,6 +41,7 @@ NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(WeatherWidget::Settings, atmosphereColors, dalc, clouds, + imageSpaces, featureSettings) WeatherWidget::~WeatherWidget() @@ -1643,6 +1660,7 @@ bool WeatherWidget::Settings::operator==(const Settings& o) const std::equal(std::begin(atmosphereColors), std::end(atmosphereColors), std::begin(o.atmosphereColors)) && std::equal(std::begin(dalc), std::end(dalc), std::begin(o.dalc)) && std::equal(std::begin(clouds), std::end(clouds), std::begin(o.clouds)) && + std::equal(std::begin(imageSpaces), std::end(imageSpaces), std::begin(o.imageSpaces)) && featureSettings == o.featureSettings; } diff --git a/src/WeatherEditor/Weather/WeatherWidget.h b/src/WeatherEditor/Weather/WeatherWidget.h index 302ab1b6c7..577ea174f2 100644 --- a/src/WeatherEditor/Weather/WeatherWidget.h +++ b/src/WeatherEditor/Weather/WeatherWidget.h @@ -67,6 +67,33 @@ class WeatherWidget : public Widget } }; + struct ImageSpaceSettings + { + // HDR Settings + float hdrEyeAdaptSpeed = 0.0f; + float hdrBloomBlurRadius = 0.0f; + float hdrBloomThreshold = 0.0f; + float hdrBloomScale = 0.0f; + float hdrSunlightScale = 0.0f; + float hdrSkyScale = 0.0f; + + // Cinematic Settings + float cinematicSaturation = 0.0f; + float cinematicBrightness = 0.0f; + float cinematicContrast = 0.0f; + + // Tint Colors + float3 tintColor = { 1.0f, 1.0f, 1.0f }; + float tintAmount = 0.0f; + + // Depth of Field + float dofStrength = 0.0f; + float dofDistance = 0.0f; + float dofRange = 0.0f; + + bool operator==(const ImageSpaceSettings&) const = default; + }; + struct Settings { std::string parent = "None"; @@ -80,11 +107,8 @@ class WeatherWidget : public Widget DALC dalc[ColorTimes::kTotal]; Cloud clouds[TESWeather::kTotalLayers]; - // Record form references - RE::TESImageSpace* imageSpaceRefs[ColorTimes::kTotal] = {}; - RE::BGSVolumetricLighting* volumetricLightingRefs[ColorTimes::kTotal] = {}; - RE::BGSShaderParticleGeometryData* precipitationData = nullptr; - RE::BGSReferenceEffect* referenceEffect = nullptr; + // ImageSpace settings for each time of day + ImageSpaceSettings imageSpaces[ColorTimes::kTotal]; // Per-feature settings storage std::map featureSettings; From d3e0022fd4391366cc90715ae6cb0de188aaaf06 Mon Sep 17 00:00:00 2001 From: SkrubbySkrubInAShrub Date: Sun, 19 Apr 2026 12:48:46 +0200 Subject: [PATCH 3/4] chore: clean dead code --- src/WeatherEditor/Weather/WeatherWidget.cpp | 18 ----------- src/WeatherEditor/Weather/WeatherWidget.h | 34 +++------------------ 2 files changed, 5 insertions(+), 47 deletions(-) diff --git a/src/WeatherEditor/Weather/WeatherWidget.cpp b/src/WeatherEditor/Weather/WeatherWidget.cpp index b4316d9d39..551a38e06b 100644 --- a/src/WeatherEditor/Weather/WeatherWidget.cpp +++ b/src/WeatherEditor/Weather/WeatherWidget.cpp @@ -16,22 +16,6 @@ NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(WeatherWidget::DirectionalColor, max, min) NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(WeatherWidget::DALC, specular, fresnelPower, directional) NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(WeatherWidget::Cloud, cloudLayerSpeedY, cloudLayerSpeedX, color, cloudAlpha, enabled, texturePath) -NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(WeatherWidget::ImageSpaceSettings, - hdrEyeAdaptSpeed, - hdrBloomBlurRadius, - hdrBloomThreshold, - hdrBloomScale, - hdrSunlightScale, - hdrSkyScale, - cinematicSaturation, - cinematicBrightness, - cinematicContrast, - tintColor, - tintAmount, - dofStrength, - dofDistance, - dofRange) - NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(WeatherWidget::Settings, parent, inheritFlags, @@ -41,7 +25,6 @@ NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(WeatherWidget::Settings, atmosphereColors, dalc, clouds, - imageSpaces, featureSettings) WeatherWidget::~WeatherWidget() @@ -1660,7 +1643,6 @@ bool WeatherWidget::Settings::operator==(const Settings& o) const std::equal(std::begin(atmosphereColors), std::end(atmosphereColors), std::begin(o.atmosphereColors)) && std::equal(std::begin(dalc), std::end(dalc), std::begin(o.dalc)) && std::equal(std::begin(clouds), std::end(clouds), std::begin(o.clouds)) && - std::equal(std::begin(imageSpaces), std::end(imageSpaces), std::begin(o.imageSpaces)) && featureSettings == o.featureSettings; } diff --git a/src/WeatherEditor/Weather/WeatherWidget.h b/src/WeatherEditor/Weather/WeatherWidget.h index 577ea174f2..302ab1b6c7 100644 --- a/src/WeatherEditor/Weather/WeatherWidget.h +++ b/src/WeatherEditor/Weather/WeatherWidget.h @@ -67,33 +67,6 @@ class WeatherWidget : public Widget } }; - struct ImageSpaceSettings - { - // HDR Settings - float hdrEyeAdaptSpeed = 0.0f; - float hdrBloomBlurRadius = 0.0f; - float hdrBloomThreshold = 0.0f; - float hdrBloomScale = 0.0f; - float hdrSunlightScale = 0.0f; - float hdrSkyScale = 0.0f; - - // Cinematic Settings - float cinematicSaturation = 0.0f; - float cinematicBrightness = 0.0f; - float cinematicContrast = 0.0f; - - // Tint Colors - float3 tintColor = { 1.0f, 1.0f, 1.0f }; - float tintAmount = 0.0f; - - // Depth of Field - float dofStrength = 0.0f; - float dofDistance = 0.0f; - float dofRange = 0.0f; - - bool operator==(const ImageSpaceSettings&) const = default; - }; - struct Settings { std::string parent = "None"; @@ -107,8 +80,11 @@ class WeatherWidget : public Widget DALC dalc[ColorTimes::kTotal]; Cloud clouds[TESWeather::kTotalLayers]; - // ImageSpace settings for each time of day - ImageSpaceSettings imageSpaces[ColorTimes::kTotal]; + // Record form references + RE::TESImageSpace* imageSpaceRefs[ColorTimes::kTotal] = {}; + RE::BGSVolumetricLighting* volumetricLightingRefs[ColorTimes::kTotal] = {}; + RE::BGSShaderParticleGeometryData* precipitationData = nullptr; + RE::BGSReferenceEffect* referenceEffect = nullptr; // Per-feature settings storage std::map featureSettings; From cce2b9a6c3b65073deb30aed31f2fa7a7dc52e55 Mon Sep 17 00:00:00 2001 From: SkrubbySkrubInAShrub Date: Sun, 19 Apr 2026 12:55:27 +0200 Subject: [PATCH 4/4] chore: remove accidental addition --- src/WeatherEditor/Weather/WeatherWidget.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/WeatherEditor/Weather/WeatherWidget.h b/src/WeatherEditor/Weather/WeatherWidget.h index 302ab1b6c7..753b859a14 100644 --- a/src/WeatherEditor/Weather/WeatherWidget.h +++ b/src/WeatherEditor/Weather/WeatherWidget.h @@ -80,12 +80,6 @@ class WeatherWidget : public Widget DALC dalc[ColorTimes::kTotal]; Cloud clouds[TESWeather::kTotalLayers]; - // Record form references - RE::TESImageSpace* imageSpaceRefs[ColorTimes::kTotal] = {}; - RE::BGSVolumetricLighting* volumetricLightingRefs[ColorTimes::kTotal] = {}; - RE::BGSShaderParticleGeometryData* precipitationData = nullptr; - RE::BGSReferenceEffect* referenceEffect = nullptr; - // Per-feature settings storage std::map featureSettings;