phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-05-09 02:23:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix(wot): scrub NaN/inf in doodad/WMO placements at save time

Browse source 
nlohmann::json serialization throws on NaN/inf floats, which would
abort the entire WOT save and leave the user with an unsaved zone
state. Scrub on the way out so a single corrupted placement can't
take down the whole save.
This commit is contained in:
Kelsi 2026-05-06 07:03:02 -07:00
parent 826d218226
commit 9ef04414d1
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tools/editor/wowee_terrain.cpp
View file

@ -107,12 +107,15 @@ bool WoweeTerrain::exportOpen(const pipeline::ADTTerrain& terrain,
for (const auto& n : terrain.doodadNames) doodadNames.push_back(n); for (const auto& n : terrain.doodadNames) doodadNames.push_back(n);
j["doodadNames"] = doodadNames; j["doodadNames"] = doodadNames;
// nlohmann::json throws on NaN/inf serialization; scrub before
// emit so a stale in-memory NaN doesn't kill the whole WOT save.
auto san = [](float x) { return std::isfinite(x) ? x : 0.0f; };
nlohmann::json doodads = nlohmann::json::array(); nlohmann::json doodads = nlohmann::json::array();
for (const auto& dp : terrain.doodadPlacements) { for (const auto& dp : terrain.doodadPlacements) {
doodads.push_back({ doodads.push_back({
{"nameId", dp.nameId}, {"uniqueId", dp.uniqueId}, {"nameId", dp.nameId}, {"uniqueId", dp.uniqueId},
{"pos", {dp.position[0], dp.position[1], dp.position[2]}}, {"pos", {san(dp.position[0]), san(dp.position[1]), san(dp.position[2])}},
{"rot", {dp.rotation[0], dp.rotation[1], dp.rotation[2]}}, {"rot", {san(dp.rotation[0]), san(dp.rotation[1]), san(dp.rotation[2])}},
{"scale", dp.scale}, {"flags", dp.flags} {"scale", dp.scale}, {"flags", dp.flags}
}); });
} }
@ -127,8 +130,8 @@ bool WoweeTerrain::exportOpen(const pipeline::ADTTerrain& terrain,
for (const auto& wp : terrain.wmoPlacements) { for (const auto& wp : terrain.wmoPlacements) {
wmos.push_back({ wmos.push_back({
{"nameId", wp.nameId}, {"uniqueId", wp.uniqueId}, {"nameId", wp.nameId}, {"uniqueId", wp.uniqueId},
{"pos", {wp.position[0], wp.position[1], wp.position[2]}}, {"pos", {san(wp.position[0]), san(wp.position[1]), san(wp.position[2])}},
{"rot", {wp.rotation[0], wp.rotation[1], wp.rotation[2]}}, {"rot", {san(wp.rotation[0]), san(wp.rotation[1]), san(wp.rotation[2])}},
{"flags", wp.flags}, {"doodadSet", wp.doodadSet} {"flags", wp.flags}, {"doodadSet", wp.doodadSet}
}); });
} }