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

Skip getLand call when no vertices are used

Browse source
This commit is contained in:
elsid 2023-08-02 11:13:07 +02:00
parent 5fda4b3cfd
commit 0da156bdc2
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
components/esm3terrain/storage.cpp
View file

@ -217,19 +217,6 @@ namespace ESMTerrain
std::size_t vertY = baseVertY; std::size_t vertY = baseVertY;
for (int cellX = startCellX; cellX < startCellX + std::ceil(size); ++cellX) for (int cellX = startCellX; cellX < startCellX + std::ceil(size); ++cellX)
{ {
const ESM::ExteriorCellLocation cellLocation(cellX, cellY, worldspace);
const LandObject* const land = getLand(cellLocation, cache);
const ESM::LandData* heightData = nullptr;
const ESM::LandData* normalData = nullptr;
const ESM::LandData* colourData = nullptr;
if (land)
{
heightData = land->getData(ESM::Land::DATA_VHGT);
normalData = land->getData(ESM::Land::DATA_VNML);
colourData = land->getData(ESM::Land::DATA_VCLR);
validHeightDataExists = true;
}
int rowStart = offsetX; int rowStart = offsetX;
int colStart = offsetY; int colStart = offsetY;
// Skip the first row / column unless we're at a chunk edge, // Skip the first row / column unless we're at a chunk edge,
@ -245,6 +232,22 @@ namespace ESMTerrain
const int colEnd = std::min( const int colEnd = std::min(
static_cast<int>(colStart + std::min(1.f, size) * (landSize - 1) + 1), static_cast<int>(landSize)); static_cast<int>(colStart + std::min(1.f, size) * (landSize - 1) + 1), static_cast<int>(landSize));
if (colEnd <= colStart || rowEnd <= rowStart)
continue;
const ESM::ExteriorCellLocation cellLocation(cellX, cellY, worldspace);
const LandObject* const land = getLand(cellLocation, cache);
const ESM::LandData* heightData = nullptr;
const ESM::LandData* normalData = nullptr;
const ESM::LandData* colourData = nullptr;
if (land)
{
heightData = land->getData(ESM::Land::DATA_VHGT);
normalData = land->getData(ESM::Land::DATA_VNML);
colourData = land->getData(ESM::Land::DATA_VCLR);
validHeightDataExists = true;
}
vertY = baseVertY; vertY = baseVertY;
std::size_t vertX = baseVertX; std::size_t vertX = baseVertX;
for (int col = colStart; col < colEnd; col += increment) for (int col = colStart; col < colEnd; col += increment)