phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-03-23 07:40:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

Fix M2 game object orientation to use +90° render yaw like characters

Browse source 
M2 game objects (signs, posts) were using orientation - 90° while
characters/NPCs use orientation + 90° for the canonical-to-render yaw
conversion. Both renderers build model matrices identically, so they
need the same offset. The old -90° was calibrated when terrain was
rotated 90°; with correct terrain the signs appeared sideways.
This commit is contained in:
Kelsi 2026-02-22 02:31:16 -08:00
parent 25bd05a631
commit 6d213ad49b
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/core/application.cpp
View file

@ -1722,7 +1722,7 @@ void Application::setupUICallbacks() {
if (auto* mr = renderer->getM2Renderer()) {
glm::mat4 transform(1.0f);
transform = glm::translate(transform, renderPos);
transform = glm::rotate(transform, orientation - glm::radians(90.0f), glm::vec3(0, 0, 1));
transform = glm::rotate(transform, orientation + glm::radians(90.0f), glm::vec3(0, 0, 1));
mr->setInstanceTransform(info.instanceId, transform);
}
}
@ -5452,9 +5452,8 @@ void Application::spawnOnlineGameObject(uint64_t guid, uint32_t entry, uint32_t
if (auto* mr = renderer->getM2Renderer()) {
glm::mat4 transform(1.0f);
transform = glm::translate(transform, renderPos);
// M2 gameobjects use model-forward alignment like character M2s.
// Apply -90deg in render space to match world-facing orientation.
transform = glm::rotate(transform, orientation - glm::radians(90.0f), glm::vec3(0, 0, 1));
// M2 gameobjects use the same canonical→render yaw as characters.
transform = glm::rotate(transform, orientation + glm::radians(90.0f), glm::vec3(0, 0, 1));
mr->setInstanceTransform(info.instanceId, transform);
}
}
@ -5509,7 +5508,7 @@ void Application::spawnOnlineGameObject(uint64_t guid, uint32_t entry, uint32_t
glm::vec3 renderPos = core::coords::canonicalToRender(glm::vec3(x, y, z));
const float renderYawWmo = orientation;
const float renderYawM2 = orientation - glm::radians(90.0f);
const float renderYawM2 = orientation + glm::radians(90.0f);
bool loadedAsWmo = false;
if (isWmo) {