From 384a1dd13acbbaaa91f35bafed473b9cbb6799f3 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 13 Jan 2024 00:44:07 +0100
Subject: [PATCH] Update PrecipitationOccluder only when there is precipitation

---
 apps/openmw/mwrender/precipitationocclusion.cpp | 17 +++++++++++++----
 apps/openmw/mwrender/precipitationocclusion.hpp |  4 +++-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwrender/precipitationocclusion.cpp b/apps/openmw/mwrender/precipitationocclusion.cpp
index 204b5c07bd..31712410b8 100644
--- a/apps/openmw/mwrender/precipitationocclusion.cpp
+++ b/apps/openmw/mwrender/precipitationocclusion.cpp
@@ -1,5 +1,7 @@
 #include "precipitationocclusion.hpp"
 
+#include <cassert>
+
 #include <osgUtil/CullVisitor>
 
 #include <components/misc/constants.hpp>
@@ -120,16 +122,19 @@ namespace MWRender
 
     void PrecipitationOccluder::update()
     {
+        if (!mRange.has_value())
+            return;
+
         const osg::Vec3 pos = mSceneCamera->getInverseViewMatrix().getTrans();
 
-        const float zmin = pos.z() - mRange.z() - Constants::CellSizeInUnits;
-        const float zmax = pos.z() + mRange.z() + Constants::CellSizeInUnits;
+        const float zmin = pos.z() - mRange->z() - Constants::CellSizeInUnits;
+        const float zmax = pos.z() + mRange->z() + Constants::CellSizeInUnits;
         const float near = 0;
         const float far = zmax - zmin;
 
-        const float left = -mRange.x() / 2;
+        const float left = -mRange->x() / 2;
         const float right = -left;
-        const float top = mRange.y() / 2;
+        const float top = mRange->y() / 2;
         const float bottom = -top;
 
         if (SceneUtil::AutoDepth::isReversed())
@@ -163,10 +168,14 @@ namespace MWRender
         mSkyCullCallback = nullptr;
 
         mRootNode->removeChild(mCamera);
+        mRange = std::nullopt;
     }
 
     void PrecipitationOccluder::updateRange(const osg::Vec3f range)
     {
+        assert(range.x() != 0);
+        assert(range.y() != 0);
+        assert(range.z() != 0);
         const osg::Vec3f margin = { -50, -50, 0 };
         mRange = range - margin;
     }
diff --git a/apps/openmw/mwrender/precipitationocclusion.hpp b/apps/openmw/mwrender/precipitationocclusion.hpp
index 26114ed42f..9d2992637e 100644
--- a/apps/openmw/mwrender/precipitationocclusion.hpp
+++ b/apps/openmw/mwrender/precipitationocclusion.hpp
@@ -4,6 +4,8 @@
 #include <osg/Camera>
 #include <osg/Texture2D>
 
+#include <optional>
+
 namespace MWRender
 {
     class PrecipitationOccluder
@@ -27,7 +29,7 @@ namespace MWRender
         osg::ref_ptr<osg::Camera> mCamera;
         osg::ref_ptr<osg::Camera> mSceneCamera;
         osg::ref_ptr<osg::Texture2D> mDepthTexture;
-        osg::Vec3f mRange;
+        std::optional<osg::Vec3f> mRange;
     };
 }