mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-25 16:43:33 +00:00
Code Issues Projects Releases Wiki Activity

takes the right terrain bounds.

Browse Source
This commit is contained in:
florent.teppe 2023-05-19 01:07:34 +02:00
parent 7bc4fc6bf9
commit 0e4d21a40c
6 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
apps/openmw/mwrender/terrainstorage.cpp
View File

@ -34,7 +34,7 @@ namespace MWRender
return land != nullptr; return land != nullptr;
} }
void TerrainStorage::getBounds(float& minX, float& maxX, float& minY, float& maxY) void TerrainStorage::getBounds(float& minX, float& maxX, float& minY, float& maxY, ESM::RefId worldspace)
{ {
minX = 0; minX = 0;
minY = 0; minY = 0;
@ -43,19 +43,41 @@ namespace MWRender
const MWWorld::ESMStore& esmStore = *MWBase::Environment::get().getESMStore(); const MWWorld::ESMStore& esmStore = *MWBase::Environment::get().getESMStore();
MWWorld::Store<ESM::Land>::iterator it = esmStore.get<ESM::Land>().begin(); if (ESM::isEsm4Ext(worldspace))
for (; it != esmStore.get<ESM::Land>().end(); ++it)
{ {
if (it->mX < minX) const auto& lands = esmStore.get<ESM4::Land>().getLands();
minX = static_cast<float>(it->mX); for (const auto& it : lands)
if (it->mX > maxX) {
maxX = static_cast<float>(it->mX); if (it.first.mWorldspace == worldspace)
if (it->mY < minY) {
minY = static_cast<float>(it->mY); int x = it.first.mX;
if (it->mY > maxY) int y = it.first.mY;
maxY = static_cast<float>(it->mY); if (x < minX)
minX = static_cast<float>(x);
if (x > maxX)
maxX = static_cast<float>(x);
if (y < minY)
minY = static_cast<float>(y);
if (y > maxY)
maxY = static_cast<float>(y);
}
}
}
else
{
MWWorld::Store<ESM::Land>::iterator it = esmStore.get<ESM::Land>().begin();
for (; it != esmStore.get<ESM::Land>().end(); ++it)
{
if (it->mX < minX)
minX = static_cast<float>(it->mX);
if (it->mX > maxX)
maxX = static_cast<float>(it->mX);
if (it->mY < minY)
minY = static_cast<float>(it->mY);
if (it->mY > maxY)
maxY = static_cast<float>(it->mY);
}
} }
// since grid coords are at cell origin, we need to add 1 cell // since grid coords are at cell origin, we need to add 1 cell
maxX += 1; maxX += 1;
maxY += 1; maxY += 1;

2
apps/openmw/mwrender/terrainstorage.hpp
View File

@ -27,7 +27,7 @@ namespace MWRender
bool hasData(ESM::ExteriorCellLocation cellLocation) override; bool hasData(ESM::ExteriorCellLocation cellLocation) override;
/// Get bounds of the whole terrain in cell units /// Get bounds of the whole terrain in cell units
void getBounds(float& minX, float& maxX, float& minY, float& maxY) override; void getBounds(float& minX, float& maxX, float& minY, float& maxY, ESM::RefId worldspace) override;
LandManager* getLandManager() const; LandManager* getLandManager() const;

1
apps/openmw/mwworld/store.hpp
View File

@ -312,6 +312,7 @@ namespace MWWorld
void updateLandPositions(const Store<ESM4::Cell>& cells); void updateLandPositions(const Store<ESM4::Cell>& cells);
const ESM4::Land* search(ESM::ExteriorCellLocation cellLocation) const; const ESM4::Land* search(ESM::ExteriorCellLocation cellLocation) const;
const std::unordered_map<ESM::ExteriorCellLocation, const ESM4::Land*>& getLands() const { return mLands; };
}; };
template <> template <>

2
components/esm3terrain/storage.hpp
View File

@ -72,7 +72,7 @@ namespace ESMTerrain
virtual osg::ref_ptr<const LandObject> getLand(ESM::ExteriorCellLocation cellLocation) = 0; virtual osg::ref_ptr<const LandObject> getLand(ESM::ExteriorCellLocation cellLocation) = 0;
virtual const ESM::LandTexture* getLandTexture(int index, short plugin) = 0; virtual const ESM::LandTexture* getLandTexture(int index, short plugin) = 0;
/// Get bounds of the whole terrain in cell units /// Get bounds of the whole terrain in cell units
void getBounds(float& minX, float& maxX, float& minY, float& maxY) override = 0; void getBounds(float& minX, float& maxX, float& minY, float& maxY, ESM::RefId worldspace) override = 0;
/// Get the minimum and maximum heights of a terrain region. /// Get the minimum and maximum heights of a terrain region.
/// @note Will only be called for chunks with size = minBatchSize, i.e. leafs of the quad tree. /// @note Will only be called for chunks with size = minBatchSize, i.e. leafs of the quad tree.

2
components/terrain/quadtreeworld.cpp
View File

@ -130,7 +130,7 @@ namespace Terrain
void build() void build()
{ {
mStorage->getBounds(mMinX, mMaxX, mMinY, mMaxY); mStorage->getBounds(mMinX, mMaxX, mMinY, mMaxY, mWorldspace);
int origSizeX = static_cast<int>(mMaxX - mMinX); int origSizeX = static_cast<int>(mMaxX - mMinX);
int origSizeY = static_cast<int>(mMaxY - mMinY); int origSizeY = static_cast<int>(mMaxY - mMinY);

2
components/terrain/storage.hpp
View File

@ -29,7 +29,7 @@ namespace Terrain
public: public:
/// Get bounds of the whole terrain in cell units /// Get bounds of the whole terrain in cell units
virtual void getBounds(float& minX, float& maxX, float& minY, float& maxY) = 0; virtual void getBounds(float& minX, float& maxX, float& minY, float& maxY, ESM::RefId worldspace) = 0;
/// Return true if there is land data for this cell /// Return true if there is land data for this cell
/// May be overriden for a faster implementation /// May be overriden for a faster implementation