Merge 44bee4cbd7 into e5150d7d21

lib/typhoon

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

src/object/client/CGObject_C.cpp

@@ -111,10 +111,6 @@ 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,8 +40,6 @@ 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,14 +183,6 @@ 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,8 +32,6 @@ 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();
@@ -44,7 +42,6 @@ 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);
@@ -68,8 +65,6 @@ 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

@@ -1,6 +0,0 @@
-#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

@@ -1,13 +0,0 @@
-#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,7 +32,3 @@ C3Vector CPassenger::GetPosition(const C3Vector& position) const {
 
     return position;
 }
-
-WOWGUID CPassenger::GetTransportGUID() const {
-    return this->m_transportGUID;
-}

src/object/movement/CPassenger.hpp

@@ -16,7 +16,6 @@ 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,12 +1,10 @@
 #include "ui/game/CGCamera.hpp"
-#include "console/CVar.hpp"
-#include "object/Client.hpp"
-#include "object/client/CVehicleCamera_C.hpp"
 #include "ui/game/Types.hpp"
+#include "console/CVar.hpp"
 #include "world/World.hpp"
-#include <algorithm>
 #include <storm/String.hpp>
 #include <tempest/Math.hpp>
+#include <algorithm>
 
 static CVar* s_cameraView;
 
@@ -77,23 +75,8 @@ int32_t CGCamera::HasModel() const {
 }
 
 C33Matrix CGCamera::ParentToWorld() const {
-    auto relativeTo = ClntObjMgrObjectPtr(this->m_relativeTo, TYPE_OBJECT, __FILE__, __LINE__);
-
-    if (!relativeTo) {
+    // TODO
     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 {