mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-20 10:23:51 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2757 from Capostrophic/land

Browse source 
Fix ESM::Land oversights
This commit is contained in:
Andrei Kortunov 2020-04-04 19:52:18 +04:00 committed by GitHub
commit 0ce953ff7d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
components/esm/loadland.cpp
View file

@ -75,6 +75,7 @@ namespace ESM
mContext = esm.getContext(); mContext = esm.getContext();
mLandData = nullptr; mLandData = nullptr;
std::fill(std::begin(mWnam), std::end(mWnam), 0);
// Skip the land data here. Load it when the cell is loaded. // Skip the land data here. Load it when the cell is loaded.
while (esm.hasMoreSubs()) while (esm.hasMoreSubs())
@ -156,30 +157,25 @@ namespace ESM
} }
esm.writeHNT("VHGT", offsets, sizeof(VHGT)); esm.writeHNT("VHGT", offsets, sizeof(VHGT));
} }
} if (mDataTypes & Land::DATA_WNAM)
if (mDataTypes & Land::DATA_WNAM)
{
// Generate WNAM record
signed char wnam[LAND_GLOBAL_MAP_LOD_SIZE];
float max = std::numeric_limits<signed char>::max();
float min = std::numeric_limits<signed char>::min();
float vertMult = static_cast<float>(ESM::Land::LAND_SIZE - 1) / LAND_GLOBAL_MAP_LOD_SIZE_SQRT;
for (int row = 0; row < LAND_GLOBAL_MAP_LOD_SIZE_SQRT; ++row)
{ {
for (int col = 0; col < LAND_GLOBAL_MAP_LOD_SIZE_SQRT; ++col) // Generate WNAM record
signed char wnam[LAND_GLOBAL_MAP_LOD_SIZE];
float max = std::numeric_limits<signed char>::max();
float min = std::numeric_limits<signed char>::min();
float vertMult = static_cast<float>(ESM::Land::LAND_SIZE - 1) / LAND_GLOBAL_MAP_LOD_SIZE_SQRT;
for (int row = 0; row < LAND_GLOBAL_MAP_LOD_SIZE_SQRT; ++row)
{ {
float height = mLandData->mHeights[int(row * vertMult) * ESM::Land::LAND_SIZE + int(col * vertMult)]; for (int col = 0; col < LAND_GLOBAL_MAP_LOD_SIZE_SQRT; ++col)
height /= height > 0 ? 128.f : 16.f; {
height = std::min(max, std::max(min, height)); float height = mLandData->mHeights[int(row * vertMult) * ESM::Land::LAND_SIZE + int(col * vertMult)];
wnam[row * LAND_GLOBAL_MAP_LOD_SIZE_SQRT + col] = static_cast<signed char>(height); height /= height > 0 ? 128.f : 16.f;
height = std::min(max, std::max(min, height));
wnam[row * LAND_GLOBAL_MAP_LOD_SIZE_SQRT + col] = static_cast<signed char>(height);
}
} }
esm.writeHNT("WNAM", wnam);
} }
esm.writeHNT("WNAM", wnam);
}
if (mLandData)
{
if (mDataTypes & Land::DATA_VCLR) { if (mDataTypes & Land::DATA_VCLR) {
esm.writeHNT("VCLR", mLandData->mColours); esm.writeHNT("VCLR", mLandData->mColours);
} }
@ -196,15 +192,13 @@ namespace ESM
{ {
mPlugin = 0; mPlugin = 0;
for (int i = 0; i < LAND_GLOBAL_MAP_LOD_SIZE; ++i) std::fill(std::begin(mWnam), std::end(mWnam), 0);
mWnam[0] = 0;
if (!mLandData) if (!mLandData)
mLandData = new LandData; mLandData = new LandData;
mLandData->mHeightOffset = 0; mLandData->mHeightOffset = 0;
for (int i = 0; i < LAND_NUM_VERTS; ++i) std::fill(std::begin(mLandData->mHeights), std::end(mLandData->mHeights), 0);
mLandData->mHeights[i] = 0;
mLandData->mMinHeight = 0; mLandData->mMinHeight = 0;
mLandData->mMaxHeight = 0; mLandData->mMaxHeight = 0;
for (int i = 0; i < LAND_NUM_VERTS; ++i) for (int i = 0; i < LAND_NUM_VERTS; ++i)
@ -213,14 +207,8 @@ namespace ESM
mLandData->mNormals[i*3+1] = 0; mLandData->mNormals[i*3+1] = 0;
mLandData->mNormals[i*3+2] = 127; mLandData->mNormals[i*3+2] = 127;
} }
for (int i = 0; i < LAND_NUM_TEXTURES; ++i) std::fill(std::begin(mLandData->mTextures), std::end(mLandData->mTextures), 0);
mLandData->mTextures[i] = 0; std::fill(std::begin(mLandData->mColours), std::end(mLandData->mColours), 255);
for (int i = 0; i < LAND_NUM_VERTS; ++i)
{
mLandData->mColours[i*3+0] = 255;
mLandData->mColours[i*3+1] = 255;
mLandData->mColours[i*3+2] = 255;
}
mLandData->mUnk1 = 0; mLandData->mUnk1 = 0;
mLandData->mUnk2 = 0; mLandData->mUnk2 = 0;
mLandData->mDataLoaded = Land::DATA_VNML | Land::DATA_VHGT | Land::DATA_WNAM | mLandData->mDataLoaded = Land::DATA_VNML | Land::DATA_VHGT | Land::DATA_WNAM |
@ -338,7 +326,7 @@ namespace ESM
Land::Land (const Land& land) Land::Land (const Land& land)
: mFlags (land.mFlags), mX (land.mX), mY (land.mY), mPlugin (land.mPlugin), : mFlags (land.mFlags), mX (land.mX), mY (land.mY), mPlugin (land.mPlugin),
mContext (land.mContext), mDataTypes (land.mDataTypes), mContext (land.mContext), mDataTypes (land.mDataTypes),
mLandData (land.mLandData ? new LandData (*land.mLandData) : 0) mLandData (land.mLandData ? new LandData (*land.mLandData) : nullptr)
{ {
std::copy(land.mWnam, land.mWnam + LAND_GLOBAL_MAP_LOD_SIZE, mWnam); std::copy(land.mWnam, land.mWnam + LAND_GLOBAL_MAP_LOD_SIZE, mWnam);
} }
@ -364,7 +352,7 @@ namespace ESM
const Land::LandData *Land::getLandData (int flags) const const Land::LandData *Land::getLandData (int flags) const
{ {
if (!(flags & mDataTypes)) if (!(flags & mDataTypes))
return 0; return nullptr;
loadData (flags); loadData (flags);
return mLandData; return mLandData;
@ -400,7 +388,7 @@ namespace ESM
if (!mLandData->mDataLoaded) if (!mLandData->mDataLoaded)
{ {
delete mLandData; delete mLandData;
mLandData = 0; mLandData = nullptr;
} }
} }
} }