mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-03 21:19:40 +00:00
Code Issues Releases Wiki Activity

Load default terrain if there is none defined

Browse source
This commit is contained in:
scrawl 2016-01-13 15:37:43 +01:00
parent e07be2d912
commit 62fe47b144
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
components/esmterrain/storage.cpp
View file

@ -14,6 +14,8 @@
namespace ESMTerrain namespace ESMTerrain
{ {
const float defaultHeight = -2048;
Storage::Storage(const VFS::Manager *vfs) Storage::Storage(const VFS::Manager *vfs)
: mVFS(vfs) : mVFS(vfs)
{ {
@ -62,7 +64,9 @@ namespace ESMTerrain
return true; return true;
} }
return false; min = defaultHeight;
max = defaultHeight;
return true;
} }
void Storage::fixNormal (osg::Vec3f& normal, int cellX, int cellY, int col, int row) void Storage::fixNormal (osg::Vec3f& normal, int cellX, int cellY, int col, int row)
@ -203,7 +207,7 @@ namespace ESMTerrain
assert (vertX < numVerts); assert (vertX < numVerts);
assert (vertY < numVerts); assert (vertY < numVerts);
float height = -2048; float height = defaultHeight;
if (heightData) if (heightData)
height = heightData->mHeights[col*ESM::Land::LAND_SIZE + row]; height = heightData->mHeights[col*ESM::Land::LAND_SIZE + row];
@ -412,7 +416,7 @@ namespace ESMTerrain
const ESM::Land* land = getLand(cellX, cellY); const ESM::Land* land = getLand(cellX, cellY);
if (!land || !(land->mDataTypes&ESM::Land::DATA_VHGT)) if (!land || !(land->mDataTypes&ESM::Land::DATA_VHGT))
return -2048; return defaultHeight;
// Mostly lifted from Ogre::Terrain::getHeightAtTerrainPosition // Mostly lifted from Ogre::Terrain::getHeightAtTerrainPosition