Merge pull request #75 from namreeb/fixed_wmo_rotation

Fixed wmo rotation
namreeb · Jul 26, 2024 · fc04d2a · fc04d2a
2 parents c494bbc + 2d279e5
commit fc04d2a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/MapViewer/main.cpp b/MapViewer/main.cpp
@@ -292,8 +292,11 @@ LRESULT CALLBACK GuiWindowProc(HWND hWnd, UINT message, WPARAM wParam,
                         if (gNavMesh->FindPath(gStart, hit, path, false))
                             gRenderer->AddPath(path);
                         else
+                        {
                             MessageBox(nullptr, "FindPath failed", "Path Find",
                                        0);
+                            return TRUE;
+                        }
 
                         auto const& prev_hop = path[path.size() - 2];
                         float height;

diff --git a/parser/Wmo/WmoPlacement.hpp b/parser/Wmo/WmoPlacement.hpp
@@ -53,23 +53,28 @@ struct WmoPlacement
     {
         auto constexpr mid = 32.f * MeshSettings::AdtSize;
 
+        // rotation around x (north/south)
         auto const rotX = math::Convert::ToRadians(Orientation.Z);
+
+        // rotation around y (east/west)
         auto const rotY = math::Convert::ToRadians(Orientation.X);
+
+        // rotation around z (vertical)
         auto const rotZ = math::Convert::ToRadians(Orientation.Y + 180.f);
 
         // 0xFFFFFFFF is the unique id used for a global WMO (a map which has no
         // ADTs but instead spawns a single WMO)
-        auto const translationMatrix =
+        const math::Matrix translationMatrix =
             UniqueId == 0xFFFFFFFF ?
                 math::Matrix::CreateTranslationMatrix(
                     {BasePosition.Z, BasePosition.X, BasePosition.Y}) :
                 math::Matrix::CreateTranslationMatrix({mid - BasePosition.Z,
                                                        mid - BasePosition.X,
                                                        BasePosition.Y});
 
-        matrix = translationMatrix * math::Matrix::CreateRotationX(rotX) *
+        matrix = translationMatrix * math::Matrix::CreateRotationZ(rotZ) *
                  math::Matrix::CreateRotationY(rotY) *
-                 math::Matrix::CreateRotationZ(rotZ);
+                 math::Matrix::CreateRotationX(rotX);
     }
 };
 #pragma pack(pop)