phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-05-06 17:13:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix(whm): exportOpen sanitizes heights + caps alphaSize at 64KB on save

Browse source 
Sanitize at write time too, not just on load. A mid-edit NaN spike
(e.g. brush operation that produced NaN before being committed) would
otherwise be persisted into the WHM and require the load-time guard
to clean it up forever after. AlphaSize is also capped at 64KB to
match the loader cap.
This commit is contained in:
Kelsi 2026-05-06 06:32:24 -07:00
parent 2df49c725f
commit 71378c20ff
1 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
tools/editor/wowee_terrain.cpp
View file

@ -6,6 +6,7 @@
#include <fstream>
#include <filesystem>
#include <cstring>
#include <cmath>
namespace wowee {
namespace editor {
@ -30,10 +31,23 @@ bool WoweeTerrain::exportOpen(const pipeline::ADTTerrain& terrain,
// Per-chunk: baseHeight(4) + heights[145](580) + alphaSize(4) + alphaData(N)
for (int ci = 0; ci < 256; ci++) {
const auto& chunk = terrain.chunks[ci];
// Sanitize base + heights on save so a corrupt in-memory terrain
// (e.g. mid-edit NaN spike) doesn't get persisted into the WHM
// and require the load-time guard to clean up forever after.
float base = chunk.position[2];
if (!std::isfinite(base)) base = 0.0f;
f.write(reinterpret_cast<const char*>(&base), 4);
f.write(reinterpret_cast<const char*>(chunk.heightMap.heights.data()), 145 * 4);
uint32_t alphaSize = static_cast<uint32_t>(chunk.alphaMap.size());
float clean[145];
for (int i = 0; i < 145; i++) {
clean[i] = chunk.heightMap.heights[i];
if (!std::isfinite(clean[i])) clean[i] = 0.0f;
}
f.write(reinterpret_cast<const char*>(clean), 145 * 4);
// Cap alpha size at 64KB (matches loader cap) — alphaMap is
// bounded in practice but defensive truncation prevents a
// stale memory state from producing an unloadable WHM.
uint32_t alphaSize = std::min<uint32_t>(
static_cast<uint32_t>(chunk.alphaMap.size()), 65536);
f.write(reinterpret_cast<const char*>(&alphaSize), 4);
if (alphaSize > 0) {
f.write(reinterpret_cast<const char*>(chunk.alphaMap.data()), alphaSize);