Merge e985629f09 into fa98bbc1f0

src/client/ClientServices.cpp

@@ -160,6 +160,11 @@ ClientConnection* ClientServices::Connection() {
     return ClientServices::s_currentConnection;
 }
 
+uint32_t ClientServices::CharacterValidateName(const char* name) {
+    // TODO
+    return 87;
+}
+
 void ClientServices::Disconnect() {
     ClientServices::Connection()->Disconnect();
 }

src/client/ClientServices.hpp

@@ -33,6 +33,7 @@ class ClientServices : public LoginResponse {
         // Static functions
         static void ConnectToSelectedServer();
         static ClientConnection* Connection();
+        static uint32_t CharacterValidateName(const char* name);
         static void Disconnect();
         static const char* GetCurrentLoginPortal();
         static const char* GetCurrentLoginServer();

src/object/client/CGObject_C.cpp

@@ -95,6 +95,10 @@ void CGObject_C::Disable() {
     this->m_disableTimeMs = CWorld::GetCurTimeMs();
 }
 
+float CGObject_C::GetFacing() const {
+    return 0.0f;
+}
+
 int32_t CGObject_C::GetModelFileName(const char*& name) const {
     return false;
 }
@@ -103,6 +107,10 @@ CM2Model* CGObject_C::GetObjectModel() {
     return this->m_model;
 }
 
+C3Vector CGObject_C::GetPosition() const {
+    return { 0.0f, 0.0f, 0.0f };
+}
+
 int32_t CGObject_C::IsInReenable() {
     return this->m_inReenable;
 }

src/object/client/CGObject_C.hpp

@@ -36,6 +36,10 @@ class CGObject_C : public CGObject, public TSHashObject<CGObject_C, CHashKeyGUID
         virtual void HandleOutOfRange(OUT_OF_RANGE_TYPE type) {};
         virtual void UpdateWorldObject(int32_t a2);
         // TODO
+        virtual C3Vector GetPosition() const;
+        // TODO
+        virtual float GetFacing() const;
+        // TODO
         virtual int32_t GetModelFileName(const char*& name) const;
         // TODO
         virtual int32_t CanHighlight();

src/ui/game/CGCamera.cpp

@@ -38,6 +38,9 @@ bool ValidateCameraView(CVar* var, const char* oldValue, const char* value, void
 }
 
 CGCamera::CGCamera() : CSimpleCamera(CWorld::GetNearClip(), CWorld::GetFarClip(), 90.0f * CMath::DEG2RAD) {
+    this->m_model = nullptr;
+
+    this->m_target = 0;
     this->m_relativeTo = 0;
 
     this->m_view = s_cameraView->GetInt();
@@ -63,6 +66,14 @@ C3Vector CGCamera::Forward() const {
     return this->CSimpleCamera::Forward();
 }
 
+const WOWGUID& CGCamera::GetTarget() const {
+    return this->m_target;
+}
+
+int32_t CGCamera::HasModel() const {
+    return this->m_model != nullptr;
+}
+
 C33Matrix CGCamera::ParentToWorld() const {
     // TODO
     return {};

src/ui/game/CGCamera.hpp

@@ -4,6 +4,8 @@
 #include "ui/simple/CSimpleCamera.hpp"
 #include "util/GUID.hpp"
 
+class CM2Model;
+
 class CGCamera : public CSimpleCamera {
     public:
         // Public structs
@@ -25,12 +27,17 @@ class CGCamera : public CSimpleCamera {
 
         // Public member functions
         CGCamera();
+        const WOWGUID& GetTarget() const;
+        int32_t HasModel() const;
         C33Matrix ParentToWorld() const;
         void SetupWorldProjection(const CRect& projRect);
         C3Vector Target() const;
 
     private:
         // Private member variables
+        CM2Model* m_model;
+        // TODO
+        WOWGUID m_target;
         // TODO
         WOWGUID m_relativeTo;
         // TODO

src/ui/game/CGWorldFrame.cpp

@@ -2,8 +2,10 @@
 #include "gx/Coordinate.hpp"
 #include "gx/Shader.hpp"
 #include "gx/Transform.hpp"
+#include "object/Client.hpp"
 #include "ui/game/CGCamera.hpp"
 #include "ui/game/PlayerName.hpp"
+#include "world/World.hpp"
 #include <storm/Memory.hpp>
 #include <tempest/Matrix.hpp>
 
@@ -92,7 +94,19 @@ void CGWorldFrame::OnWorldRender() {
 void CGWorldFrame::OnWorldUpdate() {
     // TODO
 
+    auto target = ClntObjMgrObjectPtr(this->m_camera->GetTarget(), TYPE_OBJECT, __FILE__, __LINE__);
+
+    // TODO
+
     this->m_camera->SetupWorldProjection(this->m_screenRect);
 
     // TODO
+
+    auto targetPos = target && !this->m_camera->HasModel()
+        ? target->GetPosition()
+        : this->m_camera->Position();
+
+    CWorld::Update(this->m_camera->Position(), this->m_camera->Target(), targetPos);
+
+    // TODO
 }

src/world/CWorld.cpp

@@ -213,3 +213,7 @@ void CWorld::SetUpdateTime(float tickTimeSec, uint32_t curTimeMs) {
     CWorld::s_tickTimeMs = static_cast<uint32_t>(tickTimeSec * 1000.0f);
     CWorld::s_tickTimeSec = tickTimeSec;
 }
+
+void CWorld::Update(const C3Vector& cameraPos, const C3Vector& cameraTarget, const C3Vector& targetPos) {
+    // TODO
+}

src/world/CWorld.hpp

@@ -70,6 +70,7 @@ class CWorld {
         static int32_t OnTick(const EVENT_DATA_TICK* data, void* param);
         static void SetFarClip(float farClip);
         static void SetUpdateTime(float tickTimeSec, uint32_t curTimeMs);
+        static void Update(const C3Vector& cameraPos, const C3Vector& cameraTarget, const C3Vector& targetPos);
 
     private:
         // Private static variables