X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fclient%2FInteractiveState.hpp;h=1129e997fdbcfd2f7d1377a73b9b7a61c9d5806a;hb=c1da86ebab41895bf49ed747c75ecf722e8c5586;hp=efaeae425c03d869ef8df008ebad386793138b72;hpb=13e676a6e49128ebc6c63b8dd08bef51d360e8e9;p=blank.git

diff --git a/src/client/InteractiveState.hpp b/src/client/InteractiveState.hpp
index efaeae4..1129e99 100644
--- a/src/client/InteractiveState.hpp
+++ b/src/client/InteractiveState.hpp
@@ -2,10 +2,22 @@
 #define BLANK_CLIENT_INTERACTIVESTATE_HPP_
 
 #include "../app/State.hpp"
+#include "../ui/ClientController.hpp"
+
+#include "ChunkReceiver.hpp"
+#include "ChunkRequester.hpp"
+#include "NetworkedInput.hpp"
+#include "../app/IntervalTimer.hpp"
+#include "../graphics/SkyBox.hpp"
 #include "../io/WorldSave.hpp"
+#include "../model/Skeletons.hpp"
+#include "../ui/HUD.hpp"
+#include "../ui/InteractiveManipulator.hpp"
 #include "../ui/Interface.hpp"
 #include "../world/BlockTypeRegistry.hpp"
 #include "../world/ChunkRenderer.hpp"
+#include "../world/EntityState.hpp"
+#include "../world/Player.hpp"
 #include "../world/World.hpp"
 
 
@@ -18,13 +30,16 @@ namespace client {
 class MasterState;
 
 class InteractiveState
-: public State {
+: public State
+, public ClientController {
 
 public:
 	explicit InteractiveState(MasterState &, std::uint32_t player_id);
 
 	World &GetWorld() noexcept { return world; }
-	Interface &GetInterface() noexcept { return interface; }
+	Player &GetPlayer() noexcept { return player; }
+	ChunkReceiver &GetChunkReceiver() noexcept { return chunk_receiver; }
+	Skeletons &GetSkeletons() noexcept { return skeletons; }
 
 	void OnEnter() override;
 
@@ -32,13 +47,31 @@ public:
 	void Update(int dt) override;
 	void Render(Viewport &) override;
 
+	void MergePlayerCorrection(std::uint16_t, const EntityState &);
+
+	void SetAudio(bool) override;
+	void SetVideo(bool) override;
+	void SetHUD(bool) override;
+	void SetDebug(bool) override;
+	void Exit() override;
+
 private:
 	MasterState &master;
 	BlockTypeRegistry block_types;
 	WorldSave save;
 	World world;
+	Player &player;
+	HUD hud;
+	InteractiveManipulator manip;
+	NetworkedInput input;
 	Interface interface;
+	ChunkRequester chunk_requester;
+	ChunkReceiver chunk_receiver;
 	ChunkRenderer chunk_renderer;
+	Skeletons skeletons;
+	IntervalTimer loop_timer;
+
+	SkyBox sky;
 
 };