From 1e06d74f821a7f3a7cbe4c3e85bbe8a04fd34621 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 28 Oct 2023 15:14:00 +0200
Subject: [PATCH 1/2] Fix #7621

---
 apps/openmw/mwrender/renderingmanager.cpp | 5 +++--
 components/terrain/quadtreeworld.cpp      | 5 +++--
 components/terrain/quadtreeworld.hpp      | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 3b6716ce2c..67b166e1f5 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -1319,6 +1319,7 @@ namespace MWRender
         const float lodFactor = Settings::terrain().mLodFactor;
         const bool groundcover = Settings::groundcover().mEnabled;
         const bool distantTerrain = Settings::terrain().mDistantTerrain;
+        const double expiryDelay = Settings::cells().mCacheExpiryDelay;
         if (distantTerrain || groundcover)
         {
             const int compMapResolution = Settings::terrain().mCompositeMapResolution;
@@ -1329,7 +1330,7 @@ namespace MWRender
             const bool debugChunks = Settings::terrain().mDebugChunks;
             auto quadTreeWorld = std::make_unique<Terrain::QuadTreeWorld>(mSceneRoot, mRootNode, mResourceSystem,
                 mTerrainStorage.get(), Mask_Terrain, Mask_PreCompile, Mask_Debug, compMapResolution, compMapLevel,
-                lodFactor, vertexLodMod, maxCompGeometrySize, debugChunks, worldspace);
+                lodFactor, vertexLodMod, maxCompGeometrySize, debugChunks, worldspace, expiryDelay);
             if (Settings::terrain().mObjectPaging)
             {
                 newChunkMgr.mObjectPaging
@@ -1351,7 +1352,7 @@ namespace MWRender
         }
         else
             newChunkMgr.mTerrain = std::make_unique<Terrain::TerrainGrid>(mSceneRoot, mRootNode, mResourceSystem,
-                mTerrainStorage.get(), Mask_Terrain, worldspace, Mask_PreCompile, Mask_Debug);
+                mTerrainStorage.get(), Mask_Terrain, worldspace, expiryDelay, Mask_PreCompile, Mask_Debug);
 
         newChunkMgr.mTerrain->setTargetFrameRate(Settings::cells().mTargetFramerate);
         float distanceMult = std::cos(osg::DegreesToRadians(std::min(mFieldOfView, 140.f)) / 2.f);
diff --git a/components/terrain/quadtreeworld.cpp b/components/terrain/quadtreeworld.cpp
index 52edd96b9f..bdf9f56790 100644
--- a/components/terrain/quadtreeworld.cpp
+++ b/components/terrain/quadtreeworld.cpp
@@ -280,8 +280,9 @@ namespace Terrain
     QuadTreeWorld::QuadTreeWorld(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem,
         Storage* storage, unsigned int nodeMask, unsigned int preCompileMask, unsigned int borderMask,
         int compMapResolution, float compMapLevel, float lodFactor, int vertexLodMod, float maxCompGeometrySize,
-        bool debugChunks, ESM::RefId worldspace)
-        : TerrainGrid(parent, compileRoot, resourceSystem, storage, nodeMask, worldspace, preCompileMask, borderMask)
+        bool debugChunks, ESM::RefId worldspace, double expiryDelay)
+        : TerrainGrid(
+            parent, compileRoot, resourceSystem, storage, nodeMask, worldspace, expiryDelay, preCompileMask, borderMask)
         , mViewDataMap(new ViewDataMap)
         , mQuadTreeBuilt(false)
         , mLodFactor(lodFactor)
diff --git a/components/terrain/quadtreeworld.hpp b/components/terrain/quadtreeworld.hpp
index 2524dc046f..fa800d2655 100644
--- a/components/terrain/quadtreeworld.hpp
+++ b/components/terrain/quadtreeworld.hpp
@@ -33,7 +33,7 @@ namespace Terrain
         QuadTreeWorld(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem,
             Storage* storage, unsigned int nodeMask, unsigned int preCompileMask, unsigned int borderMask,
             int compMapResolution, float comMapLevel, float lodFactor, int vertexLodMod, float maxCompGeometrySize,
-            bool debugChunks, ESM::RefId worldspace);
+            bool debugChunks, ESM::RefId worldspace, double expiryDelay);
 
         ~QuadTreeWorld();
 

From e51d1967f4297e71b8762505dd190c806f0e8994 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Fri, 3 Nov 2023 17:24:35 +0100
Subject: [PATCH 2/2] Base cell size on worldspace

---
 components/terrain/cellborder.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/terrain/cellborder.cpp b/components/terrain/cellborder.cpp
index 06767531d3..b78691cd8d 100644
--- a/components/terrain/cellborder.cpp
+++ b/components/terrain/cellborder.cpp
@@ -6,6 +6,7 @@
 
 #include "world.hpp"
 
+#include <components/esm/util.hpp>
 #include <components/esm3/loadland.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/terrain/storage.hpp>
@@ -25,7 +26,7 @@ namespace Terrain
     osg::ref_ptr<osg::Group> CellBorder::createBorderGeometry(float x, float y, float size, Terrain::Storage* terrain,
         Resource::SceneManager* sceneManager, int mask, ESM::RefId worldspace, float offset, osg::Vec4f color)
     {
-        const int cellSize = ESM::Land::REAL_SIZE;
+        const int cellSize = ESM::getCellSize(worldspace);
         const int borderSegments = 40;
 
         osg::Vec3 cellCorner = osg::Vec3(x * cellSize, y * cellSize, 0);