mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-29 04:06:40 +00:00
Code Issues Releases Wiki Activity

Move collectESM3References to unnamed namespace

Browse source
This commit is contained in:
elsid 2024-05-05 12:58:35 +02:00
parent 524af5b723
commit 0040409a4d
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
2 changed files with 57 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,6 +15,7 @@
#include <components/esm3/esmreader.hpp> #include <components/esm3/esmreader.hpp>
#include <components/esm3/loadacti.hpp> #include <components/esm3/loadacti.hpp>
#include <components/esm3/loadcell.hpp>
#include <components/esm3/loadcont.hpp> #include <components/esm3/loadcont.hpp>
#include <components/esm3/loaddoor.hpp> #include <components/esm3/loaddoor.hpp>
#include <components/esm3/loadstat.hpp> #include <components/esm3/loadstat.hpp>
@ -465,8 +466,10 @@ namespace MWRender
{ {
} }
std::map<ESM::RefNum, ESM::CellRef> ObjectPaging::collectESM3References( namespace
float size, const osg::Vec2i& startCell, ESM::ReadersCache& readers) const {
std::map<ESM::RefNum, ESM::CellRef> collectESM3References(
float size, const osg::Vec2i& startCell, ESM::ReadersCache& readers)
{ {
std::map<ESM::RefNum, ESM::CellRef> refs; std::map<ESM::RefNum, ESM::CellRef> refs;
const auto& store = MWBase::Environment::get().getWorld()->getStore(); const auto& store = MWBase::Environment::get().getWorld()->getStore();
@ -516,6 +519,7 @@ namespace MWRender
continue; continue;
} }
} }
for (auto [ref, deleted] : cell->mLeasedRefs) for (auto [ref, deleted] : cell->mLeasedRefs)
{ {
if (deleted) if (deleted)
@ -532,6 +536,7 @@ namespace MWRender
} }
return refs; return refs;
} }
}
osg::ref_ptr<osg::Node> ObjectPaging::createChunk(float size, const osg::Vec2f& center, bool activeGrid, osg::ref_ptr<osg::Node> ObjectPaging::createChunk(float size, const osg::Vec2f& center, bool activeGrid,
const osg::Vec3f& viewPoint, bool compile, unsigned char lod) const osg::Vec3f& viewPoint, bool compile, unsigned char lod)

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;