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

refactor(sql): use core::coords::renderToCanonical for render->WoW swap

Browse source 
Replaces hand-written x/y swap with the canonical helper from
include/core/coordinates.hpp so the conversion stays in sync if the
coord convention changes.
This commit is contained in:
Kelsi 2026-05-06 02:52:46 -07:00
parent 0f42ebab3d
commit fa631a45d6
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
tools/editor/sql_exporter.cpp
View file

@ -1,4 +1,5 @@
#include "sql_exporter.hpp" #include "sql_exporter.hpp"
#include "core/coordinates.hpp"
#include "core/logger.hpp" #include "core/logger.hpp"
#include <fstream> #include <fstream>
#include <filesystem> #include <filesystem>
@ -88,12 +89,12 @@ bool SQLExporter::exportCreatures(const std::vector<CreatureSpawn>& spawns,
if (s.behavior == CreatureBehavior::Wander) movementType = 1; if (s.behavior == CreatureBehavior::Wander) movementType = 1;
if (s.behavior == CreatureBehavior::Patrol) movementType = 2; if (s.behavior == CreatureBehavior::Patrol) movementType = 2;
// Editor stores positions in render coords (renderX=wowY, renderY=wowX, // Editor stores positions in render coords; AzerothCore expects WoW
// renderZ=wowZ) but AzerothCore creature.position_x/y are WoW canonical // canonical (X=north, Y=west). renderToCanonical handles the swap.
// (X=north-south, Y=west-east). Swap x/y on the way out. const glm::vec3 wow = core::coords::renderToCanonical(s.position);
const float wowX = s.position.y; const float wowX = wow.x;
const float wowY = s.position.x; const float wowY = wow.y;
const float wowZ = s.position.z; const float wowZ = wow.z;
// AzerothCore expects orientation in radians from +X (north). Editor's // AzerothCore expects orientation in radians from +X (north). Editor's
// orientation is in degrees from +renderX (west). Convert via: // orientation is in degrees from +renderX (west). Convert via:
// wowYaw = π/2 - editorYaw // wowYaw = π/2 - editorYaw
@ -136,10 +137,10 @@ bool SQLExporter::exportCreatures(const std::vector<CreatureSpawn>& spawns,
for (size_t pi = 0; pi < s.patrolPath.size(); pi++) { for (size_t pi = 0; pi < s.patrolPath.size(); pi++) {
const auto& wp = s.patrolPath[pi]; const auto& wp = s.patrolPath[pi];
// Same render -> WoW canonical swap as the spawn position. const glm::vec3 wpWow = core::coords::renderToCanonical(wp.position);
const float wpWowX = wp.position.y; const float wpWowX = wpWow.x;
const float wpWowY = wp.position.x; const float wpWowY = wpWow.y;
const float wpWowZ = wp.position.z; const float wpWowZ = wpWow.z;
f << "INSERT INTO `waypoint_data` " f << "INSERT INTO `waypoint_data` "
<< "(`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`) VALUES (" << "(`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`) VALUES ("
<< pathId << ", " << (pi + 1) << ", " << pathId << ", " << (pi + 1) << ", "