block sounds depending on block type

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

diff --git a/src/client/InteractiveState.hpp b/src/client/InteractiveState.hpp
index e679eb2990a5f47f285eee7eef3202776e71e83f..b86258e9f2bb892bb06309f3e29a9c39ff717dc2 100644 (file)
--- a/src/client/InteractiveState.hpp
+++ b/src/client/InteractiveState.hpp
@@ -2,10 +2,22 @@
 #define BLANK_CLIENT_INTERACTIVESTATE_HPP_
 
 #include "../app/State.hpp"
+#include "../ui/ClientController.hpp"
+
+#include "ChunkReceiver.hpp"
+#include "NetworkedInput.hpp"
+#include "../app/IntervalTimer.hpp"
+#include "../audio/SoundBank.hpp"
+#include "../graphics/SkyBox.hpp"
 #include "../io/WorldSave.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"
 #include "../world/World.hpp"
 
 
@@ -18,13 +30,15 @@ namespace client {
 class MasterState;
 
 class InteractiveState
-: public State {
+: public State
+, public ClientController {
 
 public:
-       explicit InteractiveState(MasterState &);
+       explicit InteractiveState(MasterState &, std::uint32_t player_id);
 
        World &GetWorld() noexcept { return world; }
-       Interface &GetInterface() noexcept { return interface; }
+       Player &GetPlayer() noexcept { return player; }
+       ChunkReceiver &GetChunkReceiver() noexcept { return chunk_receiver; }
 
        void OnEnter() override;
 
@@ -32,13 +46,47 @@ public:
        void Update(int dt) override;
        void Render(Viewport &) override;
 
+       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;
+       void SetVideo(bool) override;
+       void SetHUD(bool) override;
+       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;
-       ChunkRenderer chunk_renderer;
+       Player &player;
+       HUD hud;
+       InteractiveManipulator manip;
+       NetworkedInput input;
        Interface interface;
+       ChunkReceiver chunk_receiver;
+       ChunkRenderer chunk_renderer;
+       IntervalTimer loop_timer;
+
+       SkyBox sky;
+
+       struct UpdateStatus {
+               std::uint16_t last_packet;
+               int last_update;
+       };
+       std::map<std::uint32_t, UpdateStatus> update_status;
 
 };