mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-21 07:09:42 +00:00
Code Issues Releases Wiki Activity

It loads cells and palce sstatics in them

Browse source 
Many missing meshes, no lights etc... But can coc into interior cells and see them.
This commit is contained in:
florent.teppe 2023-01-24 23:17:04 +01:00
parent 3515c8e61a
commit 6d25d4bc13
1 changed files with 42 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
apps/openmw/mwworld/cellstore.cpp
View file

@ -790,6 +790,7 @@ namespace MWWorld
void CellStore::loadRefs() void CellStore::loadRefs()
{ {
assert(mCellVariant.isValid()); assert(mCellVariant.isValid());
std::map<ESM::RefNum, ESM::RefId> refNumToID; // used to detect refID modifications
if (mCellVariant.isEsm4()) if (mCellVariant.isEsm4())
{ {
@ -805,62 +806,60 @@ namespace MWWorld
} }
++it; ++it;
} }
return;
} }
else
if (mCell->mContextList.empty())
return; // this is a dynamically generated cell -> skipping.
std::map<ESM::RefNum, ESM::RefId> refNumToID; // used to detect refID modifications
// Load references from all plugins that do something with this cell.
for (size_t i = 0; i < mCell->mContextList.size(); i++)
{ {
try if (mCell->mContextList.empty())
return; // this is a dynamically generated cell -> skipping.
// Load references from all plugins that do something with this cell.
for (size_t i = 0; i < mCell->mContextList.size(); i++)
{ {
// Reopen the ESM reader and seek to the right position. try
const std::size_t index = static_cast<std::size_t>(mCell->mContextList[i].index);
const ESM::ReadersCache::BusyItem reader = mReaders.get(index);
mCell->restore(*reader, i);
ESM::CellRef ref;
// Get each reference in turn
ESM::MovedCellRef cMRef;
bool deleted = false;
bool moved = false;
while (ESM::Cell::getNextRef(
*reader, ref, deleted, cMRef, moved, ESM::Cell::GetNextRefMode::LoadOnlyNotMoved))
{ {
if (moved) // Reopen the ESM reader and seek to the right position.
continue; const std::size_t index = static_cast<std::size_t>(mCell->mContextList[i].index);
const ESM::ReadersCache::BusyItem reader = mReaders.get(index);
mCell->restore(*reader, i);
// Don't load reference if it was moved to a different cell. ESM::CellRef ref;
ESM::MovedCellRefTracker::const_iterator iter // Get each reference in turn
= std::find(mCell->mMovedRefs.begin(), mCell->mMovedRefs.end(), ref.mRefNum); ESM::MovedCellRef cMRef;
if (iter != mCell->mMovedRefs.end()) bool deleted = false;
bool moved = false;
while (ESM::Cell::getNextRef(
*reader, ref, deleted, cMRef, moved, ESM::Cell::GetNextRefMode::LoadOnlyNotMoved))
{ {
continue; if (moved)
} continue;
loadRef(ref, deleted, refNumToID); // Don't load reference if it was moved to a different cell.
ESM::MovedCellRefTracker::const_iterator iter
= std::find(mCell->mMovedRefs.begin(), mCell->mMovedRefs.end(), ref.mRefNum);
if (iter != mCell->mMovedRefs.end())
{
continue;
}
loadRef(ref, deleted, refNumToID);
}
}
catch (std::exception& e)
{
Log(Debug::Error) << "An error occurred loading references for cell " << getCell()->getDescription()
<< ": " << e.what();
} }
} }
catch (std::exception& e) // Load moved references, from separately tracked list.
for (const auto& leasedRef : mCell->mLeasedRefs)
{ {
Log(Debug::Error) << "An error occurred loading references for cell " << getCell()->getDescription() ESM::CellRef& ref = const_cast<ESM::CellRef&>(leasedRef.first);
<< ": " << e.what(); bool deleted = leasedRef.second;
loadRef(ref, deleted, refNumToID);
} }
} }
// Load moved references, from separately tracked list.
for (const auto& leasedRef : mCell->mLeasedRefs)
{
ESM::CellRef& ref = const_cast<ESM::CellRef&>(leasedRef.first);
bool deleted = leasedRef.second;
loadRef(ref, deleted, refNumToID);
}
updateMergedRefs(); updateMergedRefs();
} }