From 921f756855b9e19363cb79355d12bb8d683ffc06 Mon Sep 17 00:00:00 2001 From: hnOsmium0001 Date: Sat, 7 May 2022 17:27:01 -0700 Subject: Reduce dependency between editor headers and main game headers --- source/App.hpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'source/App.hpp') diff --git a/source/App.hpp b/source/App.hpp index 54e1fb5..c73c5a1 100644 --- a/source/App.hpp +++ b/source/App.hpp @@ -17,14 +17,11 @@ using KeyCaptureCallback = std::function; -// TODO how should we split responsibilities between App and Editor? class App { - friend class EditorInstance; - private: std::deque mKeyCaptureCallbacks; PodVector mPlayers; - std::unique_ptr mEditor; + std::unique_ptr mEditor; GameWorld mWorld; Renderer mWorldRenderer; Camera mMainCamera; @@ -37,8 +34,9 @@ public: App(); ~App(); - EditorInstance* GetEditor() { return mEditor.get(); } + IEditor* GetEditor() { return mEditor.get(); } GameWorld* GetWorld() { return &mWorld; } + Renderer* GetWorldRenderer() { return &mWorldRenderer; } Camera* GetActiveCamera() const; void BindActiveCamera(Camera* camera); -- cgit v1.2.3-70-g09d2