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

Reduce scope for normal and color

Browse Source
This commit is contained in:
elsid 2023-08-01 20:47:16 +02:00
parent 829f325500
commit e4584ce5dd
No known key found for this signature in database
GPG Key ID: 4DE04C198CBA7625
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
components/esm3terrain/storage.cpp
View File

@ -202,9 +202,6 @@ namespace ESMTerrain
normals.resize(numVerts * numVerts); normals.resize(numVerts * numVerts);
colours.resize(numVerts * numVerts); colours.resize(numVerts * numVerts);
osg::Vec3f normal;
osg::Vec4ub color;
LandCache cache; LandCache cache;
bool alteration = useAlteration(); bool alteration = useAlteration();
@ -272,15 +269,15 @@ namespace ESMTerrain
positions[vertIndex] = osg::Vec3f((vertX / float(numVerts - 1) - 0.5f) * size * landSizeInUnits, positions[vertIndex] = osg::Vec3f((vertX / float(numVerts - 1) - 0.5f) * size * landSizeInUnits,
(vertY / float(numVerts - 1) - 0.5f) * size * landSizeInUnits, height); (vertY / float(numVerts - 1) - 0.5f) * size * landSizeInUnits, height);
if (normalData) osg::Vec3f normal(0, 0, 1);
if (normalData != nullptr)
{ {
for (int i = 0; i < 3; ++i) for (int i = 0; i < 3; ++i)
normal[i] = normalData->getNormals()[srcArrayIndex + i]; normal[i] = normalData->getNormals()[srcArrayIndex + i];
normal.normalize(); normal.normalize();
} }
else
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)
@ -294,17 +291,12 @@ namespace ESMTerrain
normals[vertIndex] = normal; normals[vertIndex] = normal;
if (colourData) osg::Vec4ub color(255, 255, 255, 255);
{
if (colourData != nullptr)
for (int i = 0; i < 3; ++i) for (int i = 0; i < 3; ++i)
color[i] = colourData->getColors()[srcArrayIndex + i]; color[i] = colourData->getColors()[srcArrayIndex + i];
}
else
{
color.r() = 255;
color.g() = 255;
color.b() = 255;
}
if (alteration) if (alteration)
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
@ -312,8 +304,6 @@ namespace ESMTerrain
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;
colours[vertIndex] = color; colours[vertIndex] = color;
++vertX; ++vertX;