mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-12-13 11:43:06 +00:00
Code Issues Releases Wiki Activity

Merge branch 'cleanup_object_paging' into 'master'

Browse source 
Cleanup object paging

See merge request OpenMW/openmw!4149
This commit is contained in:
psi29a 2024-06-04 20:39:37 +00:00
commit 8f3625b6a8
4 changed files with 509 additions and 503 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwbase/world.hpp
View file

@ -148,7 +148,7 @@ namespace MWBase
virtual MWWorld::ConstPtr getPlayerConstPtr() const = 0; virtual MWWorld::ConstPtr getPlayerConstPtr() const = 0;
virtual MWWorld::ESMStore& getStore() = 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; virtual const std::vector<int>& getESMVersions() const = 0;

994
apps/openmw/mwrender/objectpaging.cpp
View file

File diff suppressed because it is too large Load diff

14
apps/openmw/mwrender/objectpaging.hpp
View file

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

2
apps/openmw/mwworld/worldimp.hpp
View file

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