Skip to content

chore(weather-widget): remove unused code #2151

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 6 commits into from
Apr 19, 2026
Merged

chore(weather-widget): remove unused code #2151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d2a07d4
chore: clean dead code
Apr 19, 2026
b2d4889
Revert "chore: clean dead code"
Apr 19, 2026
d3e0022
chore: clean dead code
Apr 19, 2026
cce2b9a
chore: remove accidental addition
Apr 19, 2026
f34f7a7
Merge branch 'dev' into chore/weatherwidget-imagespace-deadcode-clean…
SkrubbySkrubInAShrub Apr 19, 2026
3ebf64a
Merge branch 'dev' into chore/weatherwidget-imagespace-deadcode-clean…
alandtse Apr 19, 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
18 changes: 0 additions & 18 deletions src/WeatherEditor/Weather/WeatherWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -41,7 +25,6 @@ NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(WeatherWidget::Settings,
atmosphereColors,
dalc,
clouds,
imageSpaces,
featureSettings)

WeatherWidget::~WeatherWidget()
Expand Down Expand Up @@ -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;
}

Expand Down
30 changes: 0 additions & 30 deletions src/WeatherEditor/Weather/WeatherWidget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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<std::string, json> featureSettings;

Expand Down
Loading