X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fclient%2FInteractiveState.hpp;h=5a43cd89e63b18757d4675bb7a001e0775db7884;hb=2e3774eb3f2d5d23a08731175b168566457e2192;hp=91a5944181b2979b075ddce9b80af3d2657a5a48;hpb=8507332e2d0c54aec4045fb6f0021bdc3bd57750;p=blank.git

diff --git a/src/client/InteractiveState.hpp b/src/client/InteractiveState.hpp
index 91a5944..5a43cd8 100644
--- a/src/client/InteractiveState.hpp
+++ b/src/client/InteractiveState.hpp
@@ -1,8 +1,11 @@
 #ifndef BLANK_CLIENT_INTERACTIVESTATE_HPP_
 #define BLANK_CLIENT_INTERACTIVESTATE_HPP_
 
+#include "ChunkReceiver.hpp"
+#include "ChunkRequester.hpp"
 #include "../app/IntervalTimer.hpp"
 #include "../app/State.hpp"
+#include "../graphics/SkyBox.hpp"
 #include "../io/WorldSave.hpp"
 #include "../model/Skeletons.hpp"
 #include "../ui/Interface.hpp"
@@ -30,6 +33,7 @@ public:
 
 	World &GetWorld() noexcept { return world; }
 	Interface &GetInterface() noexcept { return interface; }
+	ChunkReceiver &GetChunkReceiver() noexcept { return chunk_receiver; }
 	Skeletons &GetSkeletons() noexcept { return skeletons; }
 
 	void OnEnter() override;
@@ -38,7 +42,7 @@ public:
 	void Update(int dt) override;
 	void Render(Viewport &) override;
 
-	void PushPlayerUpdate(const Entity &);
+	void PushPlayerUpdate(const Entity &, int dt);
 	void MergePlayerCorrection(std::uint16_t, const EntityState &);
 
 private:
@@ -47,16 +51,20 @@ private:
 	WorldSave save;
 	World world;
 	Interface interface;
+	ChunkRequester chunk_requester;
+	ChunkReceiver chunk_receiver;
 	ChunkRenderer chunk_renderer;
 	Skeletons skeletons;
-	IntervalTimer update_timer;
+	IntervalTimer loop_timer;
+
+	SkyBox sky;
 
 	struct PlayerHistory {
 		EntityState state;
-		int timestamp;
+		int delta_t;
 		std::uint16_t packet;
-		PlayerHistory(EntityState s, int t, std::uint16_t p)
-		: state(s), timestamp(t), packet(p) { }
+		PlayerHistory(EntityState s, int dt, std::uint16_t p)
+		: state(s), delta_t(dt), packet(p) { }
 	};
 	std::list<PlayerHistory> player_hist;