From 38c21163eab45050096ed7067ddabddd27a3a444 Mon Sep 17 00:00:00 2001
From: bzzt lost a hitlab login <bzzt@bzzt.bzzt>
Date: Mon, 4 May 2020 13:37:00 +0000
Subject: [PATCH] + meshsizecache for reduce i&o stalling

Signed-off-by: Bret Curtis <psi29a@gmail.com>
---
 apps/openmw/mwrender/objectpaging.cpp | 21 +++++++++++++++++++--
 apps/openmw/mwrender/objectpaging.hpp |  4 ++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index 28644cecf..412123309 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -374,6 +374,17 @@ namespace MWRender
                     continue;
             }
 
+            float d = (viewPoint - pos).length();
+            {
+                OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mSizeCacheMutex);
+                SizeCache::iterator found = mSizeCache.find(pair.first);
+                if (found != mSizeCache.end())
+                {
+                    if (found->second < d*mMinSize)
+                        continue;
+                }
+            }
+
             std::string id = Misc::StringUtils::lowerCase(ref.mRefID);
             if (id == "prisonmarker" || id == "divinemarker" || id == "templemarker" || id == "northmarker")
                 continue; // marker objects that have a hardcoded function in the game logic, should be hidden from the player
@@ -389,9 +400,15 @@ namespace MWRender
 */
             osg::ref_ptr<const osg::Node> cnode = mSceneManager->getTemplate(model, compile);
 
-            float d = (viewPoint - pos).length();
-            if (cnode->getBound().radius() * ref.mScale < d*mMinSize)
+            float radius = cnode->getBound().radius() * ref.mScale;
+            if (radius < d*mMinSize)
+            {
+                OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mSizeCacheMutex);
+                {
+                    mSizeCache[pair.first] = radius;
+                }
                 continue;
+            }
 
             auto emplaced = nodes.emplace(cnode, InstanceList());
             if (emplaced.second)
diff --git a/apps/openmw/mwrender/objectpaging.hpp b/apps/openmw/mwrender/objectpaging.hpp
index 9fb3aa754..71a0db996 100644
--- a/apps/openmw/mwrender/objectpaging.hpp
+++ b/apps/openmw/mwrender/objectpaging.hpp
@@ -45,6 +45,10 @@ namespace MWRender
 
         OpenThreads::Mutex mDisabledMutex;
         std::set<ESM::RefNum> mDisabled;
+
+        OpenThreads::Mutex mSizeCacheMutex;
+        typedef std::map<ESM::RefNum, float> SizeCache;
+        SizeCache mSizeCache;
     };
 
 }