X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fclient%2FInteractiveState.hpp;h=39b393a578032e3e4aac22cb64153d8fcefd911f;hb=ae5a7e7d8517fac406a88e9bf98fd3d5bb1728b9;hp=e679eb2990a5f47f285eee7eef3202776e71e83f;hpb=1afc887a2040dfdedfa66913e94ff7a9634f648f;p=blank.git

diff --git a/src/client/InteractiveState.hpp b/src/client/InteractiveState.hpp
index e679eb2..39b393a 100644
--- a/src/client/InteractiveState.hpp
+++ b/src/client/InteractiveState.hpp
@@ -1,13 +1,19 @@
 #ifndef BLANK_CLIENT_INTERACTIVESTATE_HPP_
 #define BLANK_CLIENT_INTERACTIVESTATE_HPP_
 
+#include "../app/IntervalTimer.hpp"
 #include "../app/State.hpp"
 #include "../io/WorldSave.hpp"
+#include "../model/Skeletons.hpp"
+#include "../net/ChunkReceiver.hpp"
 #include "../ui/Interface.hpp"
 #include "../world/BlockTypeRegistry.hpp"
 #include "../world/ChunkRenderer.hpp"
+#include "../world/EntityState.hpp"
 #include "../world/World.hpp"
 
+#include <list>
+
 
 namespace blank {
 
@@ -21,10 +27,12 @@ class InteractiveState
 : public State {
 
 public:
-	explicit InteractiveState(MasterState &);
+	explicit InteractiveState(MasterState &, std::uint32_t player_id);
 
 	World &GetWorld() noexcept { return world; }
 	Interface &GetInterface() noexcept { return interface; }
+	ChunkReceiver &GetChunkReceiver() noexcept { return chunk_receiver; }
+	Skeletons &GetSkeletons() noexcept { return skeletons; }
 
 	void OnEnter() override;
 
@@ -32,13 +40,28 @@ public:
 	void Update(int dt) override;
 	void Render(Viewport &) override;
 
+	void PushPlayerUpdate(const Entity &, int dt);
+	void MergePlayerCorrection(std::uint16_t, const EntityState &);
+
 private:
 	MasterState &master;
 	BlockTypeRegistry block_types;
 	WorldSave save;
 	World world;
-	ChunkRenderer chunk_renderer;
 	Interface interface;
+	ChunkReceiver chunk_receiver;
+	ChunkRenderer chunk_renderer;
+	Skeletons skeletons;
+	IntervalTimer loop_timer;
+
+	struct PlayerHistory {
+		EntityState state;
+		int delta_t;
+		std::uint16_t packet;
+		PlayerHistory(EntityState s, int dt, std::uint16_t p)
+		: state(s), delta_t(dt), packet(p) { }
+	};
+	std::list<PlayerHistory> player_hist;
 
 };