mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-22 03:40:49 +00:00
Code Issues Projects Releases Wiki Activity

change grid and preload takes the right exterior

Browse Source 
also fixes some crashes
This commit is contained in:
florent.teppe 2023-04-23 00:12:24 +02:00
parent 81d9686541
commit eb48f8724f
4 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/openmw/mwworld/scene.cpp
View File

@ -305,7 +305,8 @@ namespace MWWorld
if (mChangeCellGridRequest.has_value()) if (mChangeCellGridRequest.has_value())
{ {
changeCellGrid(mChangeCellGridRequest->mPosition, mChangeCellGridRequest->mCell.x(), changeCellGrid(mChangeCellGridRequest->mPosition, mChangeCellGridRequest->mCell.x(),
mChangeCellGridRequest->mCell.y(), mChangeCellGridRequest->mChangeEvent); mChangeCellGridRequest->mCell.y(), mChangeCellGridRequest->exteriorWorldspace,
mChangeCellGridRequest->mChangeEvent);
mChangeCellGridRequest.reset(); mChangeCellGridRequest.reset();
} }
@ -531,10 +532,11 @@ namespace MWWorld
void Scene::requestChangeCellGrid(const osg::Vec3f& position, const osg::Vec2i& cell, bool changeEvent) void Scene::requestChangeCellGrid(const osg::Vec3f& position, const osg::Vec2i& cell, bool changeEvent)
{ {
mChangeCellGridRequest = ChangeCellGridRequest{ position, cell, changeEvent }; mChangeCellGridRequest = ChangeCellGridRequest{ position, cell, ESM::Cell::sDefaultWorldspaceId, changeEvent };
} }
void Scene::changeCellGrid(const osg::Vec3f& pos, int playerCellX, int playerCellY, bool changeEvent) void Scene::changeCellGrid(
const osg::Vec3f& pos, int playerCellX, int playerCellY, ESM::RefId exteriorWorldspace, bool changeEvent)
{ {
auto navigatorUpdateGuard = mNavigator.makeUpdateGuard(); auto navigatorUpdateGuard = mNavigator.makeUpdateGuard();
@ -551,10 +553,9 @@ namespace MWWorld
else else
unloadCell(cell, navigatorUpdateGuard.get()); unloadCell(cell, navigatorUpdateGuard.get());
} }
ESM::RefId currentWorldSpace = mCurrentCell->getCell()->getWorldSpace();
mNavigator.setWorldspace( mNavigator.setWorldspace(
Misc::StringUtils::lowerCase(mWorld.getWorldModel() Misc::StringUtils::lowerCase(mWorld.getWorldModel()
.getExterior(playerCellX, playerCellY, currentWorldSpace) .getExterior(playerCellX, playerCellY, exteriorWorldspace)
.getCell() .getCell()
->getWorldSpace() ->getWorldSpace()
.serializeText()), .serializeText()),
@ -581,7 +582,7 @@ namespace MWWorld
{ {
if (!isCellInCollection(x, y, collection)) if (!isCellInCollection(x, y, collection))
{ {
refsToLoad += mWorld.getWorldModel().getExterior(x, y, currentWorldSpace).count(); refsToLoad += mWorld.getWorldModel().getExterior(x, y, exteriorWorldspace).count();
cellsPositionsToLoad.emplace_back(x, y); cellsPositionsToLoad.emplace_back(x, y);
} }
} }
@ -615,7 +616,7 @@ namespace MWWorld
{ {
if (!isCellInCollection(x, y, mActiveCells)) if (!isCellInCollection(x, y, mActiveCells))
{ {
CellStore& cell = mWorld.getWorldModel().getExterior(x, y, currentWorldSpace); CellStore& cell = mWorld.getWorldModel().getExterior(x, y, exteriorWorldspace);
loadCell(cell, loadingListener, changeEvent, pos, navigatorUpdateGuard.get()); loadCell(cell, loadingListener, changeEvent, pos, navigatorUpdateGuard.get());
} }
} }
@ -624,7 +625,7 @@ namespace MWWorld
navigatorUpdateGuard.reset(); navigatorUpdateGuard.reset();
CellStore& current = mWorld.getWorldModel().getExterior(playerCellX, playerCellY, currentWorldSpace); CellStore& current = mWorld.getWorldModel().getExterior(playerCellX, playerCellY, exteriorWorldspace);
MWBase::Environment::get().getWindowManager()->changeCell(&current); MWBase::Environment::get().getWindowManager()->changeCell(&current);
if (changeEvent) if (changeEvent)
@ -934,7 +935,8 @@ namespace MWWorld
const osg::Vec2i cellIndex(current.getCell()->getGridX(), current.getCell()->getGridY()); const osg::Vec2i cellIndex(current.getCell()->getGridX(), current.getCell()->getGridY());
changeCellGrid(position.asVec3(), cellIndex.x(), cellIndex.y(), changeEvent); changeCellGrid(
position.asVec3(), cellIndex.x(), cellIndex.y(), current.getCell()->getWorldSpace(), changeEvent);
changePlayerCell(current, position, adjustPlayerPos); changePlayerCell(current, position, adjustPlayerPos);
@ -1094,7 +1096,7 @@ namespace MWWorld
mLastPlayerPos = playerPos; mLastPlayerPos = playerPos;
if (mPreloadEnabled) if (mPreloadEnabled && mCurrentCell->getCell()->getWorldSpace() == ESM::Cell::sDefaultWorldspaceId)
{ {
if (mPreloadDoors) if (mPreloadDoors)
preloadTeleportDoorDestinations(playerPos, predictedPos, exteriorPositions); preloadTeleportDoorDestinations(playerPos, predictedPos, exteriorPositions);

4
apps/openmw/mwworld/scene.hpp
View File

@ -80,6 +80,7 @@ namespace MWWorld
{ {
osg::Vec3f mPosition; osg::Vec3f mPosition;
osg::Vec2i mCell; osg::Vec2i mCell;
ESM::RefId exteriorWorldspace;
bool mChangeEvent; bool mChangeEvent;
}; };
@ -117,7 +118,8 @@ namespace MWWorld
osg::Vec2i mCurrentGridCenter; osg::Vec2i mCurrentGridCenter;
// Load and unload cells as necessary to create a cell grid with "X" and "Y" in the center // Load and unload cells as necessary to create a cell grid with "X" and "Y" in the center
void changeCellGrid(const osg::Vec3f& pos, int playerCellX, int playerCellY, bool changeEvent = true); void changeCellGrid(const osg::Vec3f& pos, int playerCellX, int playerCellY, ESM::RefId exteriorWorldspace,
bool changeEvent = true);
void requestChangeCellGrid(const osg::Vec3f& position, const osg::Vec2i& cell, bool changeEvent = true); void requestChangeCellGrid(const osg::Vec3f& position, const osg::Vec2i& cell, bool changeEvent = true);

9
apps/openmw/mwworld/worldimp.cpp
View File

@ -1268,12 +1268,13 @@ namespace MWWorld
CellStore* cell = ptr.getCell(); CellStore* cell = ptr.getCell();
ESM::RefId worldspaceId ESM::RefId worldspaceId
= cell->isExterior() ? cell->getCell()->getWorldSpace() : ESM::Cell::sDefaultWorldspaceId; = cell->isExterior() ? cell->getCell()->getWorldSpace() : ESM::Cell::sDefaultWorldspaceId;
CellStore& newCell = mWorldModel.getExterior(index.x(), index.y(), worldspaceId); CellStore* newCell
bool isCellActive = cell->isExterior() ? &mWorldModel.getExterior(index.x(), index.y(), worldspaceId) : nullptr;
= getPlayerPtr().isInCell() && getPlayerPtr().getCell()->isExterior() && mWorldScene->isCellActive(newCell); bool isCellActive = getPlayerPtr().isInCell() && getPlayerPtr().getCell()->isExterior()
&& mWorldScene->isCellActive(*newCell);
if (cell->isExterior() || (moveToActive && isCellActive && ptr.getClass().isActor())) if (cell->isExterior() || (moveToActive && isCellActive && ptr.getClass().isActor()))
cell = &newCell; cell = newCell;
return moveObject(ptr, cell, position, movePhysics); return moveObject(ptr, cell, position, movePhysics);
} }

1
apps/openmw/mwworld/worldmodel.cpp
View File

@ -208,7 +208,6 @@ MWWorld::CellStore& MWWorld::WorldModel::getExterior(int x, int y, ESM::RefId ex
if (!cell) if (!cell)
{ {
ESM4::Cell record; ESM4::Cell record;
record.mId = MWBase::Environment::get().getESMStore()->generateId();
record.mParent = exteriorWorldspace; record.mParent = exteriorWorldspace;
record.mX = x; record.mX = x;
record.mY = y; record.mY = y;