From af8c2a94dfbc9292f014587eb8c2031a13a62a2c Mon Sep 17 00:00:00 2001
From: Sam Hellawell <sshellawell@gmail.com>
Date: Sun, 18 Feb 2024 21:50:19 +0000
Subject: [PATCH 1/4] Fix: hardcoded weather meshes, use settings instead
Signed-off-by: Sam Hellawell <sshellawell@gmail.com>
---
apps/openmw/mwworld/weather.cpp | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index 36b5958dc3..58fea640f6 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -2,6 +2,7 @@
#include <components/misc/rng.hpp>
+#include <components/settings/values.hpp>
#include <components/esm3/esmreader.hpp>
#include <components/esm3/esmwriter.hpp>
#include <components/esm3/loadregn.hpp>
@@ -45,7 +46,7 @@ namespace MWWorld
osg::Vec3f calculateStormDirection(const std::string& particleEffect)
{
osg::Vec3f stormDirection = MWWorld::Weather::defaultDirection();
- if (particleEffect == "meshes\\ashcloud.nif" || particleEffect == "meshes\\blightcloud.nif")
+ if (particleEffect == Settings::models().mWeatherashcloud.get() || particleEffect == Settings::models().mWeatherblightcloud.get())
{
osg::Vec3f playerPos = MWMechanics::getPlayer().getRefData().getPosition().asVec3();
playerPos.z() = 0;
@@ -581,10 +582,10 @@ namespace MWWorld
addWeather("Overcast", 0.7f, 0.0f); // 3
addWeather("Rain", 0.5f, 10.0f); // 4
addWeather("Thunderstorm", 0.5f, 20.0f); // 5
- addWeather("Ashstorm", 0.2f, 50.0f, "meshes\\ashcloud.nif"); // 6
- addWeather("Blight", 0.2f, 60.0f, "meshes\\blightcloud.nif"); // 7
- addWeather("Snow", 0.5f, 40.0f, "meshes\\snow.nif"); // 8
- addWeather("Blizzard", 0.16f, 70.0f, "meshes\\blizzard.nif"); // 9
+ addWeather("Ashstorm", 0.2f, 50.0f, Settings::models().mWeatherashcloud.get()); // 6
+ addWeather("Blight", 0.2f, 60.0f, Settings::models().mWeatherblightcloud.get()); // 7
+ addWeather("Snow", 0.5f, 40.0f, Settings::models().mWeathersnow.get()); // 8
+ addWeather("Blizzard", 0.16f, 70.0f, Settings::models().mWeatherblizzard.get()); // 9
Store<ESM::Region>::iterator it = store.get<ESM::Region>().begin();
for (; it != store.get<ESM::Region>().end(); ++it)
@@ -720,7 +721,7 @@ namespace MWWorld
// For some reason Ash Storm is not considered as a precipitation weather in game
mPrecipitation = !(mResult.mParticleEffect.empty() && mResult.mRainEffect.empty())
- && mResult.mParticleEffect != "meshes\\ashcloud.nif";
+ && mResult.mParticleEffect != Settings::models().mWeatherashcloud.get();
mStormDirection = calculateStormDirection(mResult.mParticleEffect);
mRendering.getSkyManager()->setStormParticleDirection(mStormDirection);
From f28b3f660148ae73ddc2b3f7293b3ea60c8b466f Mon Sep 17 00:00:00 2001
From: Sam Hellawell <sshellawell@gmail.com>
Date: Sun, 18 Feb 2024 21:51:48 +0000
Subject: [PATCH 2/4] Style tweak
Signed-off-by: Sam Hellawell <sshellawell@gmail.com>
---
apps/openmw/mwworld/weather.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index 58fea640f6..6cca2a8cc1 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -1,8 +1,9 @@
#include "weather.hpp"
+#include <components/settings/values.hpp>
+
#include <components/misc/rng.hpp>
-#include <components/settings/values.hpp>
#include <components/esm3/esmreader.hpp>
#include <components/esm3/esmwriter.hpp>
#include <components/esm3/loadregn.hpp>
From bf7819f71d9a75b8b2b532dc930d7984fb6d514a Mon Sep 17 00:00:00 2001
From: Sam Hellawell <sshellawell@gmail.com>
Date: Sun, 18 Feb 2024 22:06:09 +0000
Subject: [PATCH 3/4] fix clang format
---
apps/openmw/mwworld/weather.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index 6cca2a8cc1..4f6f52a81a 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -47,7 +47,8 @@ namespace MWWorld
osg::Vec3f calculateStormDirection(const std::string& particleEffect)
{
osg::Vec3f stormDirection = MWWorld::Weather::defaultDirection();
- if (particleEffect == Settings::models().mWeatherashcloud.get() || particleEffect == Settings::models().mWeatherblightcloud.get())
+ if (particleEffect == Settings::models().mWeatherashcloud.get()
+ || particleEffect == Settings::models().mWeatherblightcloud.get())
{
osg::Vec3f playerPos = MWMechanics::getPlayer().getRefData().getPosition().asVec3();
playerPos.z() = 0;
From c6ee01b0bee074598e3acd86e2b14d4b7f8a27d3 Mon Sep 17 00:00:00 2001
From: Sam Hellawell <sshellawell@gmail.com>
Date: Thu, 7 Mar 2024 04:49:48 +0000
Subject: [PATCH 4/4] Apply fix to sky manager
Signed-off-by: Sam Hellawell <sshellawell@gmail.com>
---
apps/openmw/mwrender/sky.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index 9c8b0658a9..231f90fd78 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -528,7 +528,7 @@ namespace MWRender
if (hasRain())
return mRainRipplesEnabled;
- if (mParticleNode && mCurrentParticleEffect == "meshes\\snow.nif")
+ if (mParticleNode && mCurrentParticleEffect == Settings::models().mWeathersnow.get())
return mSnowRipplesEnabled;
return false;
@@ -554,7 +554,7 @@ namespace MWRender
osg::Quat quat;
quat.makeRotate(MWWorld::Weather::defaultDirection(), mStormParticleDirection);
// Morrowind deliberately rotates the blizzard mesh, so so should we.
- if (mCurrentParticleEffect == "meshes\\blizzard.nif")
+ if (mCurrentParticleEffect == Settings::models().mWeatherblizzard.get())
quat.makeRotate(osg::Vec3f(-1, 0, 0), mStormParticleDirection);
mParticleNode->setAttitude(quat);
}
@@ -726,7 +726,7 @@ namespace MWRender
const osg::Vec3 defaultWrapRange = osg::Vec3(1024, 1024, 800);
const bool occlusionEnabledForEffect
- = !mRainEffect.empty() || mCurrentParticleEffect == "meshes\\snow.nif";
+ = !mRainEffect.empty() || mCurrentParticleEffect == Settings::models().mWeathersnow.get();
for (unsigned int i = 0; i < findPSVisitor.mFoundNodes.size(); ++i)
{