Merge branch 'cleanup_object_paging' into 'master'

Cleanup object paging

See merge request OpenMW/openmw!4149

apps/openmw/mwbase/world.hpp

@@ -148,7 +148,7 @@ namespace MWBase
         virtual MWWorld::ConstPtr getPlayerConstPtr() const = 0;
 
         virtual MWWorld::ESMStore& getStore() = 0;
-        const MWWorld::ESMStore& getStore() const { return const_cast<MWBase::World*>(this)->getStore(); }
+        virtual const MWWorld::ESMStore& getStore() const = 0;
 
         virtual const std::vector<int>& getESMVersions() const = 0;
 

apps/openmw/mwrender/objectpaging.hpp

@@ -1,7 +1,7 @@
 #ifndef OPENMW_MWRENDER_OBJECTPAGING_H
 #define OPENMW_MWRENDER_OBJECTPAGING_H
 
-#include <components/esm3/loadcell.hpp>
+#include <components/esm3/refnum.hpp>
 #include <components/resource/resourcemanager.hpp>
 #include <components/terrain/quadtreeworld.hpp>
 
@@ -11,15 +11,6 @@ namespace Resource
 {
     class SceneManager;
 }
-namespace MWWorld
-{
-    class ESMStore;
-}
-
-namespace ESM
-{
-    class ReadersCache;
-}
 
 namespace MWRender
 {
@@ -82,9 +73,6 @@ namespace MWRender
         const RefTracker& getRefTracker() const { return mRefTracker; }
         RefTracker& getWritableRefTracker() { return mRefTrackerLocked ? mRefTrackerNew : mRefTracker; }
 
-        std::map<ESM::RefNum, ESM::CellRef> collectESM3References(
-            float size, const osg::Vec2i& startCell, ESM::ReadersCache& readers) const;
-
         std::mutex mSizeCacheMutex;
         typedef std::map<ESM::RefNum, float> SizeCache;
         SizeCache mSizeCache;

apps/openmw/mwworld/worldimp.hpp

@@ -239,6 +239,8 @@ namespace MWWorld
 
         MWWorld::ESMStore& getStore() override { return mStore; }
 
+        const MWWorld::ESMStore& getStore() const override { return mStore; }
+
         const std::vector<int>& getESMVersions() const override;
 
         LocalScripts& getLocalScripts() override;