Changeset: 22 Improved camera and various cleanups

1 files changed, 10 insertions, 3 deletions

diff --git a/source/App.hpp b/source/App.hpp
index 26857db..54e1fb5 100644
--- a/source/App.hpp
+++ b/source/App.hpp
@@ -17,15 +17,18 @@
 
 using KeyCaptureCallback = std::function<bool(int, int)>;
 
+// TODO how should we split responsibilities between App and Editor?
 class App {
+	friend class EditorInstance;
+
 private:
 	std::deque<KeyCaptureCallback> mKeyCaptureCallbacks;
 	PodVector<Player*> mPlayers;
 	std::unique_ptr<EditorInstance> mEditor;
 	GameWorld mWorld;
-	Camera mGameCamera;
-	Camera mEditorCamera;
-	Renderer mRenderer;
+	Renderer mWorldRenderer;
+	Camera mMainCamera;
+	Camera* mActiveCamera;
 	// NOTE: should only be true when mEditor != nullptr
 	bool mEditorVisible = false;
 	bool mGameRunning = false;
@@ -37,6 +40,10 @@ public:
 	EditorInstance* GetEditor() { return mEditor.get(); }
 	GameWorld* GetWorld() { return &mWorld; }
 
+	Camera* GetActiveCamera() const;
+	void BindActiveCamera(Camera* camera);
+	void UnbindActiveCamera();
+
 	bool IsGameRunning() const;
 	void SetGameRunning(bool running);