X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fclient%2FInteractiveState.hpp;h=b86258e9f2bb892bb06309f3e29a9c39ff717dc2;hb=07b8335e7bfd631e0878e183c87238812d632c56;hp=2db227067711aecb78223231658514eebbb7bf89;hpb=933ca0fe6c660e482edd45742d981f2de59a32df;p=blank.git

diff --git a/src/client/InteractiveState.hpp b/src/client/InteractiveState.hpp
index 2db2270..b86258e 100644
--- a/src/client/InteractiveState.hpp
+++ b/src/client/InteractiveState.hpp
@@ -5,17 +5,16 @@
 #include "../ui/ClientController.hpp"
 
 #include "ChunkReceiver.hpp"
-#include "ChunkRequester.hpp"
 #include "NetworkedInput.hpp"
 #include "../app/IntervalTimer.hpp"
+#include "../audio/SoundBank.hpp"
 #include "../graphics/SkyBox.hpp"
 #include "../io/WorldSave.hpp"
-#include "../model/Skeletons.hpp"
 #include "../net/Packet.hpp"
+#include "../shared/WorldResources.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"
@@ -40,7 +39,6 @@ public:
 	World &GetWorld() noexcept { return world; }
 	Player &GetPlayer() noexcept { return player; }
 	ChunkReceiver &GetChunkReceiver() noexcept { return chunk_receiver; }
-	Skeletons &GetSkeletons() noexcept { return skeletons; }
 
 	void OnEnter() override;
 
@@ -48,7 +46,10 @@ public:
 	void Update(int dt) override;
 	void Render(Viewport &) override;
 
-	void MergePlayerCorrection(std::uint16_t, const EntityState &);
+	void Handle(const Packet::SpawnEntity &);
+	void Handle(const Packet::DespawnEntity &);
+	void Handle(const Packet::EntityUpdate &);
+	void Handle(const Packet::PlayerCorrection &);
 	void Handle(const Packet::BlockUpdate &);
 
 	void SetAudio(bool) override;
@@ -57,9 +58,17 @@ public:
 	void SetDebug(bool) override;
 	void Exit() override;
 
+private:
+	/// flag entity as updated by given packet
+	/// returns false if the update should be ignored
+	bool UpdateEntity(std::uint32_t id, std::uint16_t seq);
+	/// drop update information or given entity
+	void ClearEntity(std::uint32_t id);
+
 private:
 	MasterState &master;
-	BlockTypeRegistry block_types;
+	WorldResources res;
+	SoundBank sounds;
 	WorldSave save;
 	World world;
 	Player &player;
@@ -67,14 +76,18 @@ private:
 	InteractiveManipulator manip;
 	NetworkedInput input;
 	Interface interface;
-	ChunkRequester chunk_requester;
 	ChunkReceiver chunk_receiver;
 	ChunkRenderer chunk_renderer;
-	Skeletons skeletons;
 	IntervalTimer loop_timer;
 
 	SkyBox sky;
 
+	struct UpdateStatus {
+		std::uint16_t last_packet;
+		int last_update;
+	};
+	std::map<std::uint32_t, UpdateStatus> update_status;
+
 };
 
 }