mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-02 07:21:07 +00:00
Code Issues Projects Releases Wiki Activity

Use std::size_t type for vertex coordinates

Browse Source
This commit is contained in:
elsid 2023-08-01 20:36:25 +02:00
parent 51b24c2b70
commit a23c98d468
No known key found for this signature in database
GPG Key ID: 4DE04C198CBA7625
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
components/esm3terrain/storage.cpp
View File

@ -196,7 +196,7 @@ namespace ESMTerrain
const int landSize = ESM::getLandSize(worldspace); const int landSize = ESM::getLandSize(worldspace);
const int landSizeInUnits = ESM::getCellSize(worldspace); const int landSizeInUnits = ESM::getCellSize(worldspace);
size_t numVerts = static_cast<size_t>(size * (landSize - 1) / increment + 1); const std::size_t numVerts = static_cast<std::size_t>(size * (landSize - 1) / increment + 1);
positions.resize(numVerts * numVerts); positions.resize(numVerts * numVerts);
normals.resize(numVerts * numVerts); normals.resize(numVerts * numVerts);
@ -205,17 +205,17 @@ namespace ESMTerrain
osg::Vec3f normal; osg::Vec3f normal;
osg::Vec4ub color; osg::Vec4ub color;
float vertY = 0; std::size_t vertY = 0;
float vertX = 0; std::size_t vertX = 0;
LandCache cache; LandCache cache;
bool alteration = useAlteration(); bool alteration = useAlteration();
bool validHeightDataExists = false; bool validHeightDataExists = false;
float vertY_ = 0; // of current cell corner std::size_t vertY_ = 0; // of current cell corner
for (int cellY = startCellY; cellY < startCellY + std::ceil(size); ++cellY) for (int cellY = startCellY; cellY < startCellY + std::ceil(size); ++cellY)
{ {
float vertX_ = 0; // of current cell corner std::size_t vertX_ = 0; // of current cell corner
for (int cellX = startCellX; cellX < startCellX + std::ceil(size); ++cellX) for (int cellX = startCellX; cellX < startCellX + std::ceil(size); ++cellX)
{ {
ESM::ExteriorCellLocation cellLocation(cellX, cellY, worldspace); ESM::ExteriorCellLocation cellLocation(cellX, cellY, worldspace);
@ -263,15 +263,15 @@ namespace ESMTerrain
assert(vertX < numVerts); assert(vertX < numVerts);
assert(vertY < numVerts); assert(vertY < numVerts);
const std::size_t vertIndex = vertX * numVerts + vertY;
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[vertIndex] = osg::Vec3f((vertX / float(numVerts - 1) - 0.5f) * size * landSizeInUnits,
positions[static_cast<unsigned int>(vertX * numVerts + vertY)] (vertY / float(numVerts - 1) - 0.5f) * size * landSizeInUnits, height);
= osg::Vec3f((vertX / float(numVerts - 1) - 0.5f) * size * landSizeInUnits,
(vertY / float(numVerts - 1) - 0.5f) * size * landSizeInUnits, height);
if (normalData) if (normalData)
{ {
@ -293,7 +293,7 @@ namespace ESMTerrain
assert(normal.z() > 0); assert(normal.z() > 0);
normals[static_cast<unsigned int>(vertX * numVerts + vertY)] = normal; normals[vertIndex] = normal;
if (colourData) if (colourData)
{ {
@ -315,7 +315,7 @@ namespace ESMTerrain
color.a() = 255; color.a() = 255;
colours[static_cast<unsigned int>(vertX * numVerts + vertY)] = color; colours[vertIndex] = color;
++vertX; ++vertX;
} }