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

diff --git a/src/client/InteractiveState.hpp b/src/client/InteractiveState.hpp
index 1129e99..f371c8c 100644
--- a/src/client/InteractiveState.hpp
+++ b/src/client/InteractiveState.hpp
@@ -5,16 +5,17 @@
 #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/ChatState.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"
@@ -31,33 +32,54 @@ class MasterState;
 
 class InteractiveState
 : public State
-, public ClientController {
+, public ClientController
+, public ChatState::Responder {
 
 public:
 	explicit InteractiveState(MasterState &, std::uint32_t player_id);
 
 	World &GetWorld() noexcept { return world; }
 	Player &GetPlayer() noexcept { return player; }
+	PlayerController &GetPlayerController() noexcept { return input; }
 	ChunkReceiver &GetChunkReceiver() noexcept { return chunk_receiver; }
-	Skeletons &GetSkeletons() noexcept { return skeletons; }
 
-	void OnEnter() override;
+	void OnResume() override;
+	void OnPause() override;
+
+	void OnFocus() override;
+	void OnBlur() override;
 
 	void Handle(const SDL_Event &) override;
 	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 Handle(const Packet::Message &);
 
 	void SetAudio(bool) override;
 	void SetVideo(bool) override;
 	void SetHUD(bool) override;
 	void SetDebug(bool) override;
+	void NextCamera() override;
 	void Exit() override;
 
+	void OnLineSubmit(const std::string &) 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;
@@ -65,14 +87,24 @@ private:
 	InteractiveManipulator manip;
 	NetworkedInput input;
 	Interface interface;
-	ChunkRequester chunk_requester;
 	ChunkReceiver chunk_receiver;
 	ChunkRenderer chunk_renderer;
-	Skeletons skeletons;
-	IntervalTimer loop_timer;
+	CoarseTimer loop_timer;
+	CoarseTimer stat_timer;
 
 	SkyBox sky;
 
+	struct UpdateStatus {
+		std::uint16_t last_packet;
+		int last_update;
+	};
+	std::map<std::uint32_t, UpdateStatus> update_status;
+
+	ChatState chat;
+
+	int time_skipped;
+	unsigned int packets_skipped;
+
 };
 
 }