X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FMasterState.hpp;h=8290e86886b53d59c246ea36d076c34acadf4dfd;hb=392826deaf802ac0960ed3924a3f98b9d18d381b;hp=959af6269c7cfd805f854f108ec67cf1c6a00e1a;hpb=76b630bd0a147bf7c78d3380237c86b9bfc48530;p=blobs.git

diff --git a/src/app/MasterState.hpp b/src/app/MasterState.hpp
index 959af62..8290e86 100644
--- a/src/app/MasterState.hpp
+++ b/src/app/MasterState.hpp
@@ -6,6 +6,8 @@
 #include "Assets.hpp"
 #include "../graphics/Camera.hpp"
 #include "../ui/CreaturePanel.hpp"
+#include "../ui/RecordsPanel.hpp"
+#include "../ui/TimePanel.hpp"
 
 
 namespace blobs {
@@ -35,10 +37,20 @@ public:
 	ui::CreaturePanel &GetCreaturePanel() noexcept { return cp; }
 	const ui::CreaturePanel &GetCreaturePanel() const noexcept { return cp; }
 
+	ui::RecordsPanel &GetRecordsPanel() noexcept { return rp; }
+	const ui::RecordsPanel &GetRecordsPanel() const noexcept { return rp; }
+
+	ui::TimePanel &GetTimePanel() noexcept { return tp; }
+	const ui::TimePanel &GetTimePanel() const noexcept { return tp; }
+
 private:
 	void OnResize(int w, int h) override;
 
 	void OnKeyDown(const SDL_KeyboardEvent &) override;
+	void OnMouseDown(const SDL_MouseButtonEvent &) override;
+	void OnMouseUp(const SDL_MouseButtonEvent &) override;
+	void OnMouseMotion(const SDL_MouseMotionEvent &) override;
+	void OnMouseWheel(const SDL_MouseWheelEvent &) override;
 
 	void OnUpdate(int dt) override;
 	void OnRender(graphics::Viewport &) override;
@@ -51,7 +63,14 @@ private:
 	world::Simulation ∼
 
 	graphics::Camera cam;
+	double cam_dist;
+	double cam_tgt_dist;
+	glm::dvec3 cam_orient;
+	bool cam_dragging;
+
 	ui::CreaturePanel cp;
+	ui::RecordsPanel rp;
+	ui::TimePanel tp;
 
 	int remain;
 	int thirds;