Merge 44bee4cbd7 into 7082e8db17

lib/typhoon

@@ -1 +1 @@
-Subproject commit 1e5366bbc6935e3363abf5921f0be12f902e790a
+Subproject commit 489f2149b74b2ca8302ec1cbcec9c6250057f7a1

src/object/client/CGObject_C.cpp

@@ -111,6 +111,10 @@ C3Vector CGObject_C::GetPosition() const {
     return { 0.0f, 0.0f, 0.0f };
 }
 
+WOWGUID CGObject_C::GetTransportGUID() const {
+    return 0;
+}
+
 int32_t CGObject_C::IsInReenable() {
     return this->m_inReenable;
 }

src/object/client/CGObject_C.hpp

@@ -40,6 +40,8 @@ class CGObject_C : public CGObject, public TSHashObject<CGObject_C, CHashKeyGUID
         // TODO
         virtual float GetFacing() const;
         // TODO
+        virtual WOWGUID GetTransportGUID() const;
+        // TODO
         virtual int32_t GetModelFileName(const char*& name) const;
         // TODO
         virtual int32_t CanHighlight();

src/object/client/CGUnit_C.cpp

@@ -183,6 +183,14 @@ C3Vector CGUnit_C::GetPosition() const {
     return this->CGUnit::GetPosition();
 }
 
+float CGUnit_C::GetRawSmoothFacing() const {
+    return this->m_smoothFacing;
+}
+
+WOWGUID CGUnit_C::GetTransportGUID() const {
+    return this->m_localMove.GetTransportGUID();
+}
+
 void CGUnit_C::PostInit(uint32_t time, const CClientObjCreate& init, bool a4) {
     // TODO
 

src/object/client/CGUnit_C.hpp

@@ -32,6 +32,8 @@ class CGUnit_C : public CGObject_C, public CGUnit {
         // TODO
         virtual float GetFacing() const;
         // TODO
+        virtual WOWGUID GetTransportGUID() const;
+        // TODO
         virtual int32_t GetModelFileName(const char*& name) const;
         // TODO
         virtual int32_t CanHighlight();
@@ -42,6 +44,7 @@ class CGUnit_C : public CGObject_C, public CGUnit {
         CGUnit_C(uint32_t time, CClientObjCreate& objCreate);
         int32_t GetDisplayID() const;
         CreatureModelDataRec* GetModelData() const;
+        float GetRawSmoothFacing() const;
         void PostInit(uint32_t time, const CClientObjCreate& init, bool a4);
         void PostMovementUpdate(const CClientMoveUpdate& move, int32_t activeMover);
         void SetStorage(uint32_t* storage, uint32_t* saved);
@@ -65,6 +68,8 @@ class CGUnit_C : public CGObject_C, public CGUnit {
         // TODO
         int32_t m_localDisplayID = 0;
         // TODO
+        float m_smoothFacing;
+        // TODO
 };
 
 #endif

src/object/client/CVehicleCamera_C.cpp

@@ -0,0 +1,6 @@
+#include "object/client/CVehicleCamera_C.hpp"
+#include "object/client/CGObject_C.hpp"
+
+int32_t CVehicleCamera_C::ConvertSmoothFacingFromRawToWorld(float& smoothFacing, CGObject_C* relativeTo) {
+    return 0;
+}

src/object/client/CVehicleCamera_C.hpp

@@ -0,0 +1,13 @@
+#ifndef OBJECT_CLIENT_C_VEHICLE_CAMERA_C_HPP
+#define OBJECT_CLIENT_C_VEHICLE_CAMERA_C_HPP
+
+#include <cstdint>
+class CGObject_C;
+
+class CVehicleCamera_C {
+    public:
+        // Public static functions
+        static int32_t ConvertSmoothFacingFromRawToWorld(float& smoothFacing, CGObject_C* relativeTo);
+};
+
+#endif

src/object/movement/CPassenger.cpp

@@ -32,3 +32,7 @@ C3Vector CPassenger::GetPosition(const C3Vector& position) const {
 
     return position;
 }
+
+WOWGUID CPassenger::GetTransportGUID() const {
+    return this->m_transportGUID;
+}

src/object/movement/CPassenger.hpp

@@ -16,6 +16,7 @@ class CPassenger {
         float GetFacing(float facing) const;
         C3Vector GetPosition() const;
         C3Vector GetPosition(const C3Vector& position) const;
+        WOWGUID GetTransportGUID() const;
 
     protected:
         // Protected member variables

src/ui/game/CGCamera.cpp

@@ -1,10 +1,12 @@
 #include "ui/game/CGCamera.hpp"
-#include "ui/game/Types.hpp"
 #include "console/CVar.hpp"
+#include "object/Client.hpp"
+#include "object/client/CVehicleCamera_C.hpp"
+#include "ui/game/Types.hpp"
 #include "world/World.hpp"
+#include <algorithm>
 #include <storm/String.hpp>
 #include <tempest/Math.hpp>
-#include <algorithm>
 
 static CVar* s_cameraView;
 
@@ -75,10 +77,25 @@ int32_t CGCamera::HasModel() const {
 }
 
 C33Matrix CGCamera::ParentToWorld() const {
-    // TODO
+    auto relativeTo = ClntObjMgrObjectPtr(this->m_relativeTo, TYPE_OBJECT, __FILE__, __LINE__);
+
+    if (!relativeTo) {
         return {};
     }
 
+    float facing;
+
+    if (relativeTo->IsA(TYPE_UNIT)) {
+        facing = static_cast<CGUnit_C*>(relativeTo)->GetRawSmoothFacing();
+        auto transport = ClntObjMgrObjectPtr(relativeTo->GetTransportGUID(), TYPE_OBJECT, __FILE__, __LINE__);
+        CVehicleCamera_C::ConvertSmoothFacingFromRawToWorld(facing, transport);
+    } else {
+        facing = relativeTo->GetFacing();
+    }
+
+    return C33Matrix::RotationAroundZ(facing);
+}
+
 C3Vector CGCamera::Right() const {
     if (this->m_relativeTo) {
         return this->CSimpleCamera::Right() * this->ParentToWorld();