slight simplification of cull test

[blank.git] / src / client / InteractiveState.hpp

diff --git a/src/client/InteractiveState.hpp b/src/client/InteractiveState.hpp
index 8e7064eacf0a1e2be1f98bf309abe463f26d7043..f371c8ca837aeb094c7ef5dc719b3f1b84c494f7 100644 (file)
--- a/src/client/InteractiveState.hpp
+++ b/src/client/InteractiveState.hpp
@@ -7,14 +7,15 @@
 #include "ChunkReceiver.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,34 +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;
@@ -68,11 +89,22 @@ private:
        Interface interface;
        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;
+
 };
 
 }