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

diff --git a/src/app/MasterState.hpp b/src/app/MasterState.hpp
index 8290e86..cb95215 100644
--- a/src/app/MasterState.hpp
+++ b/src/app/MasterState.hpp
@@ -5,12 +5,16 @@
 
 #include "Assets.hpp"
 #include "../graphics/Camera.hpp"
+#include "../ui/BodyPanel.hpp"
 #include "../ui/CreaturePanel.hpp"
 #include "../ui/RecordsPanel.hpp"
 #include "../ui/TimePanel.hpp"
 
 
 namespace blobs {
+namespace creature {
+	class Creature;
+}
 namespace world {
 	class Body;
 	class Simulation;
@@ -31,6 +35,9 @@ public:
 	MasterState &operator =(MasterState &&) = delete;
 
 public:
+	void Show(creature::Creature &) noexcept;
+	void Show(world::Body &) noexcept;
+
 	graphics::Camera &GetCamera() noexcept { return cam; }
 	const graphics::Camera &GetCamera() const noexcept { return cam; }
 
@@ -63,11 +70,20 @@ private:
 	world::Simulation ∼
 
 	graphics::Camera cam;
+	glm::dvec3 cam_pos;
+	glm::dvec3 cam_tgt_pos;
+	glm::dvec3 cam_focus;
+	glm::dvec3 cam_tgt_focus;
+	glm::dvec3 cam_up;
+	glm::dvec3 cam_tgt_up;
 	double cam_dist;
-	double cam_tgt_dist;
 	glm::dvec3 cam_orient;
 	bool cam_dragging;
 
+	creature::Creature *shown_creature;
+	world::Body *shown_body;
+
+	ui::BodyPanel bp;
 	ui::CreaturePanel cp;
 	ui::RecordsPanel rp;
 	ui::TimePanel tp;