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..753b859a14 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,9 +80,6 @@ class WeatherWidget : public Widget DALC dalc[ColorTimes::kTotal]; Cloud clouds[TESWeather::kTotalLayers]; - // ImageSpace settings for each time of day - ImageSpaceSettings imageSpaces[ColorTimes::kTotal]; - // Per-feature settings storage std::map featureSettings;