Merge c12a79d6e6 into 817cec99fe

src/object/client/CGObject_C.cpp

@@ -95,10 +95,6 @@ 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;
 }
@@ -107,10 +103,6 @@ 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,10 +36,6 @@ 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,9 +38,6 @@ 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();
@@ -66,14 +63,6 @@ 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,8 +4,6 @@
 #include "ui/simple/CSimpleCamera.hpp"
 #include "util/GUID.hpp"
 
-class CM2Model;
-
 class CGCamera : public CSimpleCamera {
     public:
         // Public structs
@@ -27,17 +25,12 @@ 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,10 +2,8 @@
 #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>
 
@@ -94,19 +92,7 @@ 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,7 +213,3 @@ 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,7 +70,6 @@ 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