Merge 44bee4cbd7 into 74bc963a1c

src/net/Types.hpp

@@ -1214,4 +1214,17 @@ struct CHARACTER_INFO {
     uint8_t firstLogin;
 };
 
+struct CHARACTER_CREATE_INFO {
+    char name[48];
+    uint8_t raceID;
+    uint8_t classID;
+    uint8_t sexID;
+    uint8_t skinID;
+    uint8_t faceID;
+    uint8_t hairStyleID;
+    uint8_t hairColorID;
+    uint8_t facialHairStyleID;
+    uint8_t outfitID;
+};
+
 #endif

src/ui/game/CGCamera.cpp

@@ -1,4 +1,5 @@
 #include "ui/game/CGCamera.hpp"
+#include "common/Time.hpp"
 #include "console/CVar.hpp"
 #include "object/Client.hpp"
 #include "object/client/CVehicleCamera_C.hpp"
@@ -39,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();
@@ -55,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);

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