Merge 4a102c6ace into 04c3dac382

src/ui/game/CGWorldFrame.cpp

@@ -1,9 +1,5 @@
 #include "ui/game/CGWorldFrame.hpp"
-#include "gx/Shader.hpp"
-#include "gx/Transform.hpp"
-#include "ui/game/PlayerName.hpp"
 #include <storm/Memory.hpp>
-#include <tempest/Matrix.hpp>
 
 CSimpleFrame* CGWorldFrame::Create(CSimpleFrame* parent) {
     // TODO use CDataAllocator
@@ -11,27 +7,6 @@ CSimpleFrame* CGWorldFrame::Create(CSimpleFrame* parent) {
     return STORM_NEW(CGWorldFrame)(parent);
 }
 
-void CGWorldFrame::RenderWorld(void* param) {
-    auto frame = reinterpret_cast<CGWorldFrame*>(param);
-
-    C44Matrix savedProj;
-    GxXformProjection(savedProj);
-
-    C44Matrix savedView;
-    GxXformView(savedView);
-
-    frame->OnWorldUpdate();
-    PlayerNameUpdateWorldText();
-
-    frame->OnWorldRender();
-    PlayerNameRenderWorldText();
-
-    GxXformSetProjection(savedProj);
-    GxXformSetView(savedView);
-
-    CShaderEffect::UpdateProjMatrix();
-}
-
 CGWorldFrame::CGWorldFrame(CSimpleFrame* parent) : CSimpleFrame(parent) {
     // TODO
 
@@ -39,27 +14,9 @@ CGWorldFrame::CGWorldFrame(CSimpleFrame* parent) : CSimpleFrame(parent) {
 
     // TODO
 
-    this->SetFrameStrata(FRAME_STRATA_WORLD);
-
     this->EnableEvent(SIMPLE_EVENT_KEY, -1);
     this->EnableEvent(SIMPLE_EVENT_MOUSE, -1);
     this->EnableEvent(SIMPLE_EVENT_MOUSEWHEEL, -1);
 
     // TODO
 }
-
-void CGWorldFrame::OnFrameRender(CRenderBatch* batch, uint32_t layer) {
-    this->CSimpleFrame::OnFrameRender(batch, layer);
-
-    if (layer == DRAWLAYER_BACKGROUND) {
-        batch->QueueCallback(&CGWorldFrame::RenderWorld, this);
-    }
-}
-
-void CGWorldFrame::OnWorldRender() {
-    // TODO
-}
-
-void CGWorldFrame::OnWorldUpdate() {
-    // TODO
-}

src/ui/game/CGWorldFrame.hpp

@@ -11,15 +11,9 @@ class CGWorldFrame : public CSimpleFrame {
 
         // Static functions
         static CSimpleFrame* Create(CSimpleFrame* parent);
-        static void RenderWorld(void* param);
-
-        // Virtual member functions
-        virtual void OnFrameRender(CRenderBatch* batch, uint32_t layer);
 
         // Member functions
         CGWorldFrame(CSimpleFrame* parent);
-        void OnWorldRender();
-        void OnWorldUpdate();
 };
 
 #endif

src/ui/game/PlayerName.cpp

@@ -1,9 +0,0 @@
-#include "ui/game/PlayerName.hpp"
-
-void PlayerNameRenderWorldText() {
-    // TODO
-}
-
-void PlayerNameUpdateWorldText() {
-    // TODO
-}

src/ui/game/PlayerName.hpp

@@ -1,8 +0,0 @@
-#ifndef UI_GAME_PLAYER_NAME_HPP
-#define UI_GAME_PLAYER_NAME_HPP
-
-void PlayerNameRenderWorldText();
-
-void PlayerNameUpdateWorldText();
-
-#endif