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

fix(sql): scrub NaN coords/orientation when emitting INSERTs

Browse source 
ostream prints NaN as 'nan' which AzerothCore's SQL import rejects
with a syntax error — would silently break the entire export from
a single bad spawn. Defensive scrub at write time, mirroring the
load-side guard pattern used everywhere else.
This commit is contained in:
Kelsi 2026-05-06 08:09:06 -07:00
parent a0876bbe3d
commit 19a4716ec1
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
tools/editor/sql_exporter.cpp
View file

@ -6,6 +6,7 @@
#include <ctime>
#include <chrono>
#include <unordered_map>
#include <cmath>
namespace wowee {
namespace editor {
@ -118,7 +119,12 @@ bool SQLExporter::exportCreatures(const std::vector<CreatureSpawn>& spawns,
// Editor stores positions in render coords; AzerothCore expects WoW
// canonical (X=north, Y=west). renderToCanonical handles the swap.
const glm::vec3 wow = core::coords::renderToCanonical(s.position);
// Sanitize each component — ostream prints NaN as "nan" which
// AzerothCore's SQL import will reject.
glm::vec3 wow = core::coords::renderToCanonical(s.position);
if (!std::isfinite(wow.x)) wow.x = 0.0f;
if (!std::isfinite(wow.y)) wow.y = 0.0f;
if (!std::isfinite(wow.z)) wow.z = 0.0f;
const float wowX = wow.x;
const float wowY = wow.y;
const float wowZ = wow.z;
@ -126,7 +132,8 @@ bool SQLExporter::exportCreatures(const std::vector<CreatureSpawn>& spawns,
// orientation is in degrees from +renderX (west). Convert via:
// wowYaw = π/2 - editorYaw
constexpr float kPi = 3.14159265358979323846f;
const float editorYawRad = s.orientation * kPi / 180.0f;
float orientation = std::isfinite(s.orientation) ? s.orientation : 0.0f;
const float editorYawRad = orientation * kPi / 180.0f;
float orientRad = kPi * 0.5f - editorYawRad;
while (orientRad < 0.0f) orientRad += 2.0f * kPi;
while (orientRad >= 2.0f * kPi) orientRad -= 2.0f * kPi;
@ -166,7 +173,10 @@ bool SQLExporter::exportCreatures(const std::vector<CreatureSpawn>& spawns,
for (size_t pi = 0; pi < s.patrolPath.size(); pi++) {
const auto& wp = s.patrolPath[pi];
const glm::vec3 wpWow = core::coords::renderToCanonical(wp.position);
glm::vec3 wpWow = core::coords::renderToCanonical(wp.position);
if (!std::isfinite(wpWow.x)) wpWow.x = 0.0f;
if (!std::isfinite(wpWow.y)) wpWow.y = 0.0f;
if (!std::isfinite(wpWow.z)) wpWow.z = 0.0f;
const float wpWowX = wpWow.x;
const float wpWowY = wpWow.y;
const float wpWowZ = wpWow.z;