Merge 0573235a70 into 74bc963a1c

lib/typhoon

@@ -1 +1 @@
-Subproject commit 1e5366bbc6935e3363abf5921f0be12f902e790a
+Subproject commit c6ee931690f71362ab76602fb6f34a6cf23d12b8

src/object/client/CGObject_C.cpp

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

src/object/client/CGObject_C.hpp

@@ -39,6 +39,9 @@ class CGObject_C : public CGObject, public TSHashObject<CGObject_C, CHashKeyGUID
         virtual C3Vector GetPosition() const;
         // TODO
         virtual float GetFacing() const;
+        virtual float GetRawFacing() const;
+        // TODO
+        virtual WOWGUID GetTransportGUID() const;
         // TODO
         virtual int32_t GetModelFileName(const char*& name) const;
         // TODO

src/object/client/CGUnit.cpp

@@ -42,6 +42,10 @@ C3Vector CGUnit::GetPosition() const {
     return this->m_move->GetPosition();
 }
 
+float CGUnit::GetRawFacing() const {
+    return this->m_move->GetRawFacing();
+}
+
 CGUnitData* CGUnit::Unit() const {
     return this->m_unit;
 }

src/object/client/CGUnit.hpp

@@ -92,6 +92,7 @@ class CGUnit {
         float GetFacing() const;
         int32_t GetNativeDisplayID() const;
         C3Vector GetPosition() const;
+        float GetRawFacing() const;
 
     protected:
         // Protected member variables

src/object/client/CGUnit_C.cpp

@@ -1,10 +1,11 @@
 #include "object/client/CGUnit_C.hpp"
 #include "component/CCharacterComponent.hpp"
+#include "db/Db.hpp"
 #include "model/Model2.hpp"
 #include "object/client/ObjMgr.hpp"
-#include "db/Db.hpp"
 #include "ui/Game.hpp"
 #include <storm/Error.hpp>
+#include <tempest/Math.hpp>
 
 WOWGUID CGUnit_C::s_activeMover;
 
@@ -183,6 +184,18 @@ C3Vector CGUnit_C::GetPosition() const {
     return this->CGUnit::GetPosition();
 }
 
+float CGUnit_C::GetRawFacing() const {
+    return this->CGUnit::GetRawFacing();
+}
+
+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
 
@@ -200,6 +213,10 @@ void CGUnit_C::PostInit(uint32_t time, const CClientObjCreate& init, bool a4) {
     }
 
     // TODO
+
+    this->m_smoothFacing = CMath::normalizeangle0to2pi(this->GetRawFacing());
+
+    // TODO
 }
 
 void CGUnit_C::PostMovementUpdate(const CClientMoveUpdate& move, int32_t activeMover) {

src/object/client/CGUnit_C.hpp

@@ -31,6 +31,9 @@ class CGUnit_C : public CGObject_C, public CGUnit {
         virtual C3Vector GetPosition() const;
         // TODO
         virtual float GetFacing() const;
+        virtual float GetRawFacing() const;
+        // TODO
+        virtual WOWGUID GetTransportGUID() const;
         // TODO
         virtual int32_t GetModelFileName(const char*& name) const;
         // TODO
@@ -42,6 +45,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 +69,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,11 @@ C3Vector CPassenger::GetPosition(const C3Vector& position) const {
 
     return position;
 }
+
+float CPassenger::GetRawFacing() const {
+    return this->m_facing;
+}
+
+WOWGUID CPassenger::GetTransportGUID() const {
+    return this->m_transportGUID;
+}

src/object/movement/CPassenger.hpp

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

src/ui/game/CGCamera.cpp

@@ -1,10 +1,13 @@
 #include "ui/game/CGCamera.hpp"
-#include "ui/game/Types.hpp"
+#include "common/Time.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;
 
@@ -37,10 +40,56 @@ bool ValidateCameraView(CVar* var, const char* oldValue, const char* value, void
 
 }
 
+int32_t CGCamera::UpdateCallback(const void*, void* param) {
+    auto camera = static_cast<CGCamera*>(param);
+
+    if (!camera) {
+        return true;
+    }
+
+    auto timestamp = OsGetAsyncTimeMsPrecise();
+
+    camera->m_nearZ = CWorld::GetNearClip();
+    camera->m_farZ = CWorld::GetFarClip();
+
+    // Model camera
+
+    if (camera->HasModel()) {
+        camera->CalcModelCamera(timestamp);
+        camera->CheckUnderwater();
+
+        return true;
+    }
+
+    // Target camera
+
+    auto target = ClntObjMgrObjectPtr(camera->m_target, TYPE_OBJECT, __FILE__, __LINE__);
+
+    if (target) {
+        camera->CalcTargetCamera(target, timestamp);
+        camera->CheckUnderwater();
+
+        return true;
+    }
+
+    // Unknown camera
+
+    auto object90 = ClntObjMgrObjectPtr(camera->guid90, TYPE_OBJECT, __FILE__, __LINE__);
+
+    if (object90) {
+        // TODO
+
+        return true;
+    }
+
+    return true;
+}
+
 CGCamera::CGCamera() : CSimpleCamera(CWorld::GetNearClip(), CWorld::GetFarClip(), 90.0f * CMath::DEG2RAD) {
     this->m_model = nullptr;
 
     this->m_target = 0;
+    this->guid90 = 0;
     this->m_relativeTo = 0;
 
     this->m_view = s_cameraView->GetInt();
@@ -53,6 +102,18 @@ CGCamera::CGCamera() : CSimpleCamera(CWorld::GetNearClip(), CWorld::GetFarClip()
     this->m_fovOffset = 0.0f;
 }
 
+void CGCamera::CalcModelCamera(uint32_t timestamp) {
+    // TODO
+}
+
+void CGCamera::CalcTargetCamera(CGObject_C* target, uint32_t timestamp) {
+    // TODO
+}
+
+void CGCamera::CheckUnderwater() {
+    // TODO
+}
+
 float CGCamera::FOV() const {
     // Clamp offset-adjusted FOV between 0pi and 1pi
     return std::min(std::max(this->m_fov + this->m_fovOffset, 0.0f), CMath::PI);
@@ -75,8 +136,23 @@ 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 {

src/ui/game/CGCamera.hpp

@@ -4,6 +4,7 @@
 #include "ui/simple/CSimpleCamera.hpp"
 #include "util/GUID.hpp"
 
+class CGObject_C;
 class CM2Model;
 
 class CGCamera : public CSimpleCamera {
@@ -18,6 +19,9 @@ class CGCamera : public CSimpleCamera {
         // Public static variables
         static CameraViewData s_cameraViewDataDefault[];
 
+        // Public static functions
+        static int32_t UpdateCallback(const void*, void* param);
+
         // Virtual public member functions
         virtual ~CGCamera() = default;
         virtual float FOV() const;
@@ -27,6 +31,9 @@ class CGCamera : public CSimpleCamera {
 
         // Public member functions
         CGCamera();
+        void CalcModelCamera(uint32_t timestamp);
+        void CalcTargetCamera(CGObject_C* target, uint32_t timestamp);
+        void CheckUnderwater();
         const WOWGUID& GetTarget() const;
         int32_t HasModel() const;
         C33Matrix ParentToWorld() const;
@@ -38,6 +45,7 @@ class CGCamera : public CSimpleCamera {
         CM2Model* m_model;
         // TODO
         WOWGUID m_target;
+        WOWGUID guid90;
         // TODO
         WOWGUID m_relativeTo;
         // TODO

src/ui/game/CGWorldFrame.cpp

@@ -98,6 +98,10 @@ void CGWorldFrame::OnWorldUpdate() {
 
     // TODO
 
+    CGCamera::UpdateCallback(nullptr, this->m_camera);
+
+    // TODO
+
     this->m_camera->SetupWorldProjection(this->m_screenRect);
 
     // TODO

src/util/Time.hpp

@@ -2,6 +2,7 @@
 #define UTIL_TIME_HPP
 
 #include "util/time/CGameTime.hpp"
+#include "util/time/Types.hpp"
 #include "util/time/WowTime.hpp"
 
 #endif

src/util/time/Types.hpp

@@ -0,0 +1,8 @@
+#ifndef UTIL_TIME_TYPES_HPP
+#define UTIL_TIME_TYPES_HPP
+
+#include <cstdint>
+
+typedef uint64_t whoa_tick_t;
+
+#endif