mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-30 04:45:33 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'scrawl/pathgrid'

Browse source
This commit is contained in:
Marc Zinnschlag 2014-12-11 20:32:32 +01:00
commit 19bd07648b
6 changed files with 49 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/openmw/mwmechanics/pathgrid.cpp
View file

@ -95,7 +95,7 @@ namespace MWMechanics
* +---------------->
* high cost
*/
bool PathgridGraph::load(const ESM::Cell* cell)
bool PathgridGraph::load(const MWWorld::CellStore *cell)
{
if(!cell)
return false;
@ -103,10 +103,9 @@ namespace MWMechanics
if(mIsGraphConstructed)
return true;
mCell = cell;
mIsExterior = cell->isExterior();
mPathgrid = MWBase::Environment::get().getWorld()->getStore().get<ESM::Pathgrid>().search(*cell);
mCell = cell->getCell();
mIsExterior = cell->getCell()->isExterior();
mPathgrid = MWBase::Environment::get().getWorld()->getStore().get<ESM::Pathgrid>().search(*cell->getCell());
if(!mPathgrid)
return false;

2
apps/openmw/mwmechanics/pathgrid.hpp
View file

@ -21,7 +21,7 @@ namespace MWMechanics
public:
PathgridGraph();
bool load(const ESM::Cell *cell);
bool load(const MWWorld::CellStore *cell);
// returns true if end point is strongly connected (i.e. reachable
// from start point) both start and end are pathgrid point indexes

3
apps/openmw/mwrender/debugging.cpp
View file

@ -231,8 +231,9 @@ void Debugging::togglePathgrid()
void Debugging::enableCellPathgrid(MWWorld::CellStore *store)
{
MWBase::World* world = MWBase::Environment::get().getWorld();
const ESM::Pathgrid *pathgrid =
MWBase::Environment::get().getWorld()->getStore().get<ESM::Pathgrid>().search(*store->getCell());
world->getStore().get<ESM::Pathgrid>().search(*store->getCell());
if (!pathgrid) return;
Vector3 cellPathGridPos(0, 0, 0);

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

@ -413,7 +413,7 @@ namespace MWWorld
// TODO: the pathgrid graph only needs to be loaded for active cells, so move this somewhere else.
// In a simple test, loading the graph for all cells in MW + expansions took 200 ms
mPathgridGraph.load(mCell);
mPathgridGraph.load(this);
}
}

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

@ -141,6 +141,8 @@ namespace MWWorld
mStores[ESM::REC_SSCR] = &mStartScripts;
mStores[ESM::REC_STAT] = &mStatics;
mStores[ESM::REC_WEAP] = &mWeapons;
mPathgrids.setCells(mCells);
}
void clearDynamic ()

64
apps/openmw/mwworld/store.hpp
View file

@ -849,15 +849,28 @@ namespace MWWorld
Interior mInt;
Exterior mExt;
Store<ESM::Cell>* mCells;
public:
void load(ESM::ESMReader &esm, const std::string &id) {
void setCells(Store<ESM::Cell>& cells)
{
mCells = &cells;
}
void load(ESM::ESMReader &esm, const std::string &id) {
ESM::Pathgrid pathgrid;
pathgrid.load(esm);
// Unfortunately the Pathgrid record model does not specify whether the pathgrid belongs to an interior or exterior cell.
// For interior cells, mCell is the cell name, but for exterior cells it is either the cell name or if that doesn't exist, the cell's region name.
// mX and mY will be (0,0) for interior cells, but there is also an exterior cell with the coordinates of (0,0), so that doesn't help.
// Check whether mCell is an interior cell. This isn't perfect, will break if a Region with the same name as an interior cell is created.
// A proper fix should be made for future versions of the file format.
bool interior = mCells->search(pathgrid.mCell) != NULL;
// Try to overwrite existing record
if (!pathgrid.mCell.empty())
if (interior)
{
std::pair<Interior::iterator, bool> ret = mInt.insert(std::make_pair(pathgrid.mCell, pathgrid));
if (!ret.second)
@ -865,8 +878,7 @@ namespace MWWorld
}
else
{
std::pair<Exterior::iterator, bool> ret = mExt.insert(std::make_pair(std::make_pair(pathgrid.mData.mX, pathgrid.mData.mY),
pathgrid));
std::pair<Exterior::iterator, bool> ret = mExt.insert(std::make_pair(std::make_pair(pathgrid.mData.mX, pathgrid.mData.mY), pathgrid));
if (!ret.second)
ret.first->second = pathgrid;
}
@ -886,45 +898,47 @@ namespace MWWorld
return NULL;
}
const ESM::Pathgrid *find(int x, int y) const {
const ESM::Pathgrid *ptr = search(x, y);
if (ptr == 0) {
std::ostringstream msg;
msg << "Pathgrid at (" << x << ", " << y << ") not found";
throw std::runtime_error(msg.str());
}
return ptr;
}
const ESM::Pathgrid *search(const std::string &name) const {
const ESM::Pathgrid *search(const std::string& name) const {
Interior::const_iterator it = mInt.find(name);
if (it != mInt.end())
return &(it->second);
return NULL;
}
const ESM::Pathgrid *find(const std::string &name) const {
const ESM::Pathgrid *ptr = search(name);
if (ptr == 0) {
const ESM::Pathgrid *find(int x, int y) const {
const ESM::Pathgrid* pathgrid = search(x,y);
if (!pathgrid)
{
std::ostringstream msg;
msg << "Pathgrid in cell '" << x << " " << y << "' not found";
throw std::runtime_error(msg.str());
}
return pathgrid;
}
const ESM::Pathgrid* find(const std::string& name) const {
const ESM::Pathgrid* pathgrid = search(name);
if (!pathgrid)
{
std::ostringstream msg;
msg << "Pathgrid in cell '" << name << "' not found";
throw std::runtime_error(msg.str());
}
return ptr;
return pathgrid;
}
const ESM::Pathgrid *search(const ESM::Cell &cell) const {
if (cell.mData.mFlags & ESM::Cell::Interior) {
if (!(cell.mData.mFlags & ESM::Cell::Interior))
return search(cell.mData.mX, cell.mData.mY);
else
return search(cell.mName);
}
return search(cell.mData.mX, cell.mData.mY);
}
const ESM::Pathgrid *find(const ESM::Cell &cell) const {
if (cell.mData.mFlags & ESM::Cell::Interior) {
if (!(cell.mData.mFlags & ESM::Cell::Interior))
return find(cell.mData.mX, cell.mData.mY);
else
return find(cell.mName);
}
return find(cell.mData.mX, cell.mData.mY);
}
};