Skip to content

fix(weather-editor): type usage and conversions #2200

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 4 commits into from
Apr 25, 2026
Merged

fix(weather-editor): type usage and conversions #2200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9cf61ab
fix: types and conversions
Apr 24, 2026
85a561a
Merge branch 'dev' into WE-WW-Lightning-colour
SkrubbySkrubInAShrub Apr 24, 2026
c7a23f4
fix: don't use C-style casting
SkrubbySkrubInAShrub Apr 25, 2026
60745ff
fix: lerp
SkrubbySkrubInAShrub Apr 25, 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
4 changes: 2 additions & 2 deletions src/Features/WeatherEditor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,8 @@ void WeatherEditor::LerpWeather(RE::TESWeather* oldWeather, RE::TESWeather* newW
newWeather->data.visualEffectEnd = LerpUint8_t(oldWeather->data.visualEffectEnd, newWeather->data.visualEffectEnd, currentWeatherPct);

//// Wind
newWeather->data.windDirection = LerpInt8_t(oldWeather->data.windDirection, newWeather->data.windDirection, currentWeatherPct);
newWeather->data.windDirectionRange = LerpInt8_t(oldWeather->data.windDirectionRange, newWeather->data.windDirectionRange, currentWeatherPct);
newWeather->data.windDirection = LerpUint8_t(oldWeather->data.windDirection, newWeather->data.windDirection, currentWeatherPct);
newWeather->data.windDirectionRange = LerpUint8_t(oldWeather->data.windDirectionRange, newWeather->data.windDirectionRange, currentWeatherPct);
newWeather->data.windSpeed = LerpUint8_t(oldWeather->data.windSpeed, newWeather->data.windSpeed, currentWeatherPct);

//// Fog
Expand Down
24 changes: 12 additions & 12 deletions src/WeatherEditor/Weather/PrecipitationWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,18 +208,18 @@ void PrecipitationWidget::ApplyChanges()

auto& runtime = precipitation->GetRuntimeData();

runtime.data[(uint32_t)RE::BGSShaderParticleGeometryData::DataID::kGravityVelocity].f = settings.gravityVelocity;
runtime.data[(uint32_t)RE::BGSShaderParticleGeometryData::DataID::kRotationVelocity].f = settings.rotationVelocity;
runtime.data[(uint32_t)RE::BGSShaderParticleGeometryData::DataID::kParticleSizeX].f = settings.particleSizeX;
runtime.data[(uint32_t)RE::BGSShaderParticleGeometryData::DataID::kParticleSizeY].f = settings.particleSizeY;
runtime.data[(uint32_t)RE::BGSShaderParticleGeometryData::DataID::kCenterOffsetMin].f = settings.centerOffsetMin;
runtime.data[(uint32_t)RE::BGSShaderParticleGeometryData::DataID::kCenterOffsetMax].f = settings.centerOffsetMax;
runtime.data[(uint32_t)RE::BGSShaderParticleGeometryData::DataID::kStartRotationRange].f = settings.startRotationRange;
runtime.data[(uint32_t)RE::BGSShaderParticleGeometryData::DataID::kNumSubtexturesX].i = settings.numSubtexturesX;
runtime.data[(uint32_t)RE::BGSShaderParticleGeometryData::DataID::kNumSubtexturesY].i = settings.numSubtexturesY;
runtime.data[(uint32_t)RE::BGSShaderParticleGeometryData::DataID::kParticleType].i = settings.particleType;
runtime.data[(uint32_t)RE::BGSShaderParticleGeometryData::DataID::kBoxSize].f = settings.boxSize;
runtime.data[(uint32_t)RE::BGSShaderParticleGeometryData::DataID::kParticleDensity].f = settings.particleDensity;
runtime.data[static_cast<uint32_t>(RE::BGSShaderParticleGeometryData::DataID::kGravityVelocity)].f = settings.gravityVelocity;
runtime.data[static_cast<uint32_t>(RE::BGSShaderParticleGeometryData::DataID::kRotationVelocity)].f = settings.rotationVelocity;
runtime.data[static_cast<uint32_t>(RE::BGSShaderParticleGeometryData::DataID::kParticleSizeX)].f = settings.particleSizeX;
runtime.data[static_cast<uint32_t>(RE::BGSShaderParticleGeometryData::DataID::kParticleSizeY)].f = settings.particleSizeY;
runtime.data[static_cast<uint32_t>(RE::BGSShaderParticleGeometryData::DataID::kCenterOffsetMin)].f = settings.centerOffsetMin;
runtime.data[static_cast<uint32_t>(RE::BGSShaderParticleGeometryData::DataID::kCenterOffsetMax)].f = settings.centerOffsetMax;
runtime.data[static_cast<uint32_t>(RE::BGSShaderParticleGeometryData::DataID::kStartRotationRange)].f = settings.startRotationRange;
runtime.data[static_cast<uint32_t>(RE::BGSShaderParticleGeometryData::DataID::kNumSubtexturesX)].i = settings.numSubtexturesX;
runtime.data[static_cast<uint32_t>(RE::BGSShaderParticleGeometryData::DataID::kNumSubtexturesY)].i = settings.numSubtexturesY;
runtime.data[static_cast<uint32_t>(RE::BGSShaderParticleGeometryData::DataID::kParticleType)].i = settings.particleType;
runtime.data[static_cast<uint32_t>(RE::BGSShaderParticleGeometryData::DataID::kBoxSize)].f = settings.boxSize;
runtime.data[static_cast<uint32_t>(RE::BGSShaderParticleGeometryData::DataID::kParticleDensity)].f = settings.particleDensity;
runtime.particleTexture.textureName = settings.particleTexture.c_str();
ApplyLiveParticleTexture(settings.particleTexture);
Widget::ForceCurrentWeatherReinit();
Expand Down
34 changes: 17 additions & 17 deletions src/WeatherEditor/Weather/WeatherWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ void WeatherWidget::DrawWidget()
if (ImGui::BeginTabItem("Basic", nullptr, basicFlags)) {
BeginScrollableContent("##BasicScroll");
DrawProperties("Sun", { { "Sun Damage", UINT8_SLIDER } });
DrawProperties("Wind", { { "Wind Speed", UINT8_SLIDER }, { "Wind Direction", INT8_SLIDER }, { "Wind Direction Range", INT8_SLIDER } });
DrawProperties("Wind", { { "Wind Speed", UINT8_SLIDER }, { "Wind Direction", UINT8_SLIDER }, { "Wind Direction Range", UINT8_SLIDER } });
DrawProperties("Precipitation", { { "Precipitation Begin Fade In", UINT8_SLIDER }, { "Precipitation End Fade Out", UINT8_SLIDER } });
DrawProperties("Lightning", { { "Thunder Lightning Begin Fade In", UINT8_SLIDER }, { "Thunder Lightning End Fade Out", UINT8_SLIDER },
{ "Thunder Lightning Frequency", UINT8_SLIDER }, { "Lightning Color", COLOR3_PICKER } });
Expand Down Expand Up @@ -558,30 +558,30 @@ void WeatherWidget::SetWeatherValues()
auto& colorData = weather->colorData;
auto& fogData = weather->fogData;

weather->data.transDelta = (uint8_t)weatherProps["Trans Delta"];
weather->data.transDelta = static_cast<uint8_t>(weatherProps["Trans Delta"]);

// Sun
data.sunGlare = (uint8_t)weatherProps["Sun Glare"];
data.sunDamage = (uint8_t)weatherProps["Sun Damage"];
data.sunGlare = static_cast<uint8_t>(weatherProps["Sun Glare"]);
data.sunDamage = static_cast<uint8_t>(weatherProps["Sun Damage"]);

// Precipitation
data.precipitationBeginFadeIn = (uint8_t)weatherProps["Precipitation Begin Fade In"];
data.precipitationEndFadeOut = (uint8_t)weatherProps["Precipitation End Fade Out"];
data.precipitationBeginFadeIn = static_cast<uint8_t>(weatherProps["Precipitation Begin Fade In"]);
data.precipitationEndFadeOut = static_cast<uint8_t>(weatherProps["Precipitation End Fade Out"]);

// Lightning
data.thunderLightningBeginFadeIn = (uint8_t)weatherProps["Thunder Lightning Begin Fade In"];
data.thunderLightningEndFadeOut = (uint8_t)weatherProps["Thunder Lightning End Fade Out"];
data.thunderLightningFrequency = (int8_t)weatherProps["Thunder Lightning Frequency"];
data.thunderLightningBeginFadeIn = static_cast<uint8_t>(weatherProps["Thunder Lightning Begin Fade In"]);
data.thunderLightningEndFadeOut = static_cast<uint8_t>(weatherProps["Thunder Lightning End Fade Out"]);
data.thunderLightningFrequency = static_cast<int8_t>(static_cast<uint8_t>(weatherProps["Thunder Lightning Frequency"]));
Float3ToColor(weatherColors["Lightning Color"], weather->data.lightningColor);

// Visual Effects
data.visualEffectBegin = (uint8_t)weatherProps["Visual Effect Begin"];
data.visualEffectEnd = (uint8_t)weatherProps["Visual Effect End"];
data.visualEffectBegin = static_cast<uint8_t>(weatherProps["Visual Effect Begin"]);
data.visualEffectEnd = static_cast<uint8_t>(weatherProps["Visual Effect End"]);

// Wind
data.windSpeed = (uint8_t)weatherProps["Wind Speed"];
data.windDirection = (int8_t)weatherProps["Wind Direction"];
data.windDirectionRange = (int8_t)weatherProps["Wind Direction Range"];
data.windSpeed = static_cast<uint8_t>(weatherProps["Wind Speed"]);
data.windDirection = static_cast<uint8_t>(weatherProps["Wind Direction"]);
data.windDirectionRange = static_cast<uint8_t>(weatherProps["Wind Direction Range"]);
Comment thread
SkrubbySkrubInAShrub marked this conversation as resolved.

// Fog
fogData.dayNear = fogProperties["Day Near"];
Expand Down Expand Up @@ -624,8 +624,8 @@ void WeatherWidget::SetWeatherValues()
for (size_t i = 0; i < TESWeather::kTotalLayers; i++) {
auto& settingsCloud = settings.clouds[i];

weather->cloudLayerSpeedX[i] = (int8_t)settingsCloud.cloudLayerSpeedX;
weather->cloudLayerSpeedY[i] = (int8_t)settingsCloud.cloudLayerSpeedY;
weather->cloudLayerSpeedX[i] = static_cast<int8_t>(settingsCloud.cloudLayerSpeedX);
weather->cloudLayerSpeedY[i] = static_cast<int8_t>(settingsCloud.cloudLayerSpeedY);

if (!settingsCloud.enabled) {
disabledBits |= (1 << i);
Expand Down Expand Up @@ -746,7 +746,7 @@ void WeatherWidget::LoadWeatherValues()
// Lightning
weatherProps["Thunder Lightning Begin Fade In"] = data.thunderLightningBeginFadeIn;
weatherProps["Thunder Lightning End Fade Out"] = data.thunderLightningEndFadeOut;
weatherProps["Thunder Lightning Frequency"] = (uint8_t)data.thunderLightningFrequency;
weatherProps["Thunder Lightning Frequency"] = static_cast<uint8_t>(data.thunderLightningFrequency);
ColorToFloat3(data.lightningColor, weatherColors["Lightning Color"]);

// Visual Effects
Expand Down
12 changes: 6 additions & 6 deletions src/WeatherEditor/WeatherUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,9 @@ void Float3ToColor(const float3& f3, RE::Color& color)

void Float3ToColor(const float3& f3, RE::TESWeather::Data::Color3& color)
{
color.red = FloatToInt8(f3.x);
color.green = FloatToInt8(f3.y);
color.blue = FloatToInt8(f3.z);
color.red = FloatToUint8(f3.x);
color.green = FloatToUint8(f3.y);
color.blue = FloatToUint8(f3.z);
}

void ColorToFloat3(const RE::Color& color, float3& f3)
Expand All @@ -176,9 +176,9 @@ void ColorToFloat3(const RE::Color& color, float3& f3)

void ColorToFloat3(const RE::TESWeather::Data::Color3& color, float3& f3)
{
f3.x = Int8ToFloat(color.red);
f3.y = Int8ToFloat(color.green);
f3.z = Int8ToFloat(color.blue);
f3.x = Uint8ToFloat(color.red);
f3.y = Uint8ToFloat(color.green);
f3.z = Uint8ToFloat(color.blue);
}

std::string ColorTimeLabel(const int i)
Expand Down
Loading