mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-25 22:11:34 +00:00
Code Issues Releases Wiki Activity

One landsize variable instead of two.

Browse source 
fixes issues in constant values.
This commit is contained in:
florent.teppe 2023-05-18 12:26:25 +02:00
parent d0211acf9e
commit feb60f5ad8
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
components/esm3terrain/storage.cpp
View file

@ -201,9 +201,10 @@ namespace ESMTerrain
int startCellX = static_cast<int>(std::floor(origin.x())); int startCellX = static_cast<int>(std::floor(origin.x()));
int startCellY = static_cast<int>(std::floor(origin.y())); int startCellY = static_cast<int>(std::floor(origin.y()));
const int LandSize = ESM::getLandSize(worldspace); const int landSize = ESM::getLandSize(worldspace);
const int LandSizeInUnits = ESM::getCellSize(worldspace);
size_t numVerts = static_cast<size_t>(size * (LandSize - 1) / increment + 1); size_t numVerts = static_cast<size_t>(size * (landSize - 1) / increment + 1);
positions->resize(numVerts * numVerts); positions->resize(numVerts * numVerts);
normals->resize(numVerts * numVerts); normals->resize(numVerts * numVerts);
@ -230,7 +231,6 @@ namespace ESMTerrain
const ESM::LandData* heightData = nullptr; const ESM::LandData* heightData = nullptr;
const ESM::LandData* normalData = nullptr; const ESM::LandData* normalData = nullptr;
const ESM::LandData* colourData = nullptr; const ESM::LandData* colourData = nullptr;
const int LandSizeInUnits = land ? land->getRealSize() : Constants::CellSizeInUnits;
if (land) if (land)
{ {
heightData = land->getData(ESM::Land::DATA_VHGT); heightData = land->getData(ESM::Land::DATA_VHGT);
@ -249,12 +249,12 @@ namespace ESMTerrain
rowStart += increment; rowStart += increment;
// Only relevant for chunks smaller than (contained in) one cell // Only relevant for chunks smaller than (contained in) one cell
rowStart += (origin.x() - startCellX) * LandSize; rowStart += (origin.x() - startCellX) * landSize;
colStart += (origin.y() - startCellY) * LandSize; colStart += (origin.y() - startCellY) * landSize;
int rowEnd = std::min( int rowEnd = std::min(
static_cast<int>(rowStart + std::min(1.f, size) * (LandSize - 1) + 1), static_cast<int>(LandSize)); static_cast<int>(rowStart + std::min(1.f, size) * (landSize - 1) + 1), static_cast<int>(landSize));
int colEnd = std::min( 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));
vertY = vertY_; vertY = vertY_;
for (int col = colStart; col < colEnd; col += increment) for (int col = colStart; col < colEnd; col += increment)
@ -262,17 +262,17 @@ namespace ESMTerrain
vertX = vertX_; vertX = vertX_;
for (int row = rowStart; row < rowEnd; row += increment) for (int row = rowStart; row < rowEnd; row += increment)
{ {
int srcArrayIndex = col * LandSize * 3 + row * 3; int srcArrayIndex = col * landSize * 3 + row * 3;
assert(row >= 0 && row < LandSize); assert(row >= 0 && row < landSize);
assert(col >= 0 && col < LandSize); assert(col >= 0 && col < landSize);
assert(vertX < numVerts); assert(vertX < numVerts);
assert(vertY < numVerts); assert(vertY < numVerts);
float height = defaultHeight; float height = defaultHeight;
if (heightData) if (heightData)
height = heightData->getHeights()[col * LandSize + row]; height = heightData->getHeights()[col * landSize + row];
if (alteration) if (alteration)
height += getAlteredHeight(col, row); height += getAlteredHeight(col, row);
(*positions)[static_cast<unsigned int>(vertX * numVerts + vertY)] (*positions)[static_cast<unsigned int>(vertX * numVerts + vertY)]
@ -290,11 +290,11 @@ namespace ESMTerrain
normal = osg::Vec3f(0, 0, 1); normal = osg::Vec3f(0, 0, 1);
// Normals apparently don't connect seamlessly between cells // Normals apparently don't connect seamlessly between cells
if (col == LandSize - 1 || row == LandSize - 1) if (col == landSize - 1 || row == landSize - 1)
fixNormal(normal, cellLocation, col, row, cache); fixNormal(normal, cellLocation, col, row, cache);
// some corner normals appear to be complete garbage (z < 0) // some corner normals appear to be complete garbage (z < 0)
if ((row == 0 || row == LandSize - 1) && (col == 0 || col == LandSize - 1)) if ((row == 0 || row == landSize - 1) && (col == 0 || col == landSize - 1))
averageNormal(normal, cellLocation, col, row, cache); averageNormal(normal, cellLocation, col, row, cache);
assert(normal.z() > 0); assert(normal.z() > 0);
@ -316,7 +316,7 @@ namespace ESMTerrain
adjustColor(col, row, heightData, color); // Does nothing by default, override in OpenMW-CS adjustColor(col, row, heightData, color); // Does nothing by default, override in OpenMW-CS
// Unlike normals, colors mostly connect seamlessly between cells, but not always... // Unlike normals, colors mostly connect seamlessly between cells, but not always...
if (col == LandSize - 1 || row == LandSize - 1) if (col == landSize - 1 || row == landSize - 1)
fixColour(color, cellLocation, col, row, cache); fixColour(color, cellLocation, col, row, cache);
color.a() = 255; color.a() = 255;

2
components/terrain/quadtreeworld.cpp
View file

@ -475,7 +475,7 @@ namespace Terrain
mRootNode->traverseNodes(vd, viewPoint, &lodCallback); mRootNode->traverseNodes(vd, viewPoint, &lodCallback);
} }
const float cellWorldSize = ESM::getLandSize(mWorldspace); const float cellWorldSize = ESM::getCellSize(mWorldspace);
for (unsigned int i = 0; i < vd->getNumEntries(); ++i) for (unsigned int i = 0; i < vd->getNumEntries(); ++i)
{ {