split input handling

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

diff --git a/src/client/InteractiveState.hpp b/src/client/InteractiveState.hpp
index 5a43cd89e63b18757d4675bb7a001e0775db7884..1b9c9a5ba06fc4b42a6a92399daee24ab6ce144a 100644 (file)
--- a/src/client/InteractiveState.hpp
+++ b/src/client/InteractiveState.hpp
@@ -1,17 +1,23 @@
 #ifndef BLANK_CLIENT_INTERACTIVESTATE_HPP_
 #define BLANK_CLIENT_INTERACTIVESTATE_HPP_
 
+#include "../app/State.hpp"
+#include "../ui/ClientController.hpp"
+
 #include "ChunkReceiver.hpp"
 #include "ChunkRequester.hpp"
 #include "../app/IntervalTimer.hpp"
-#include "../app/State.hpp"
 #include "../graphics/SkyBox.hpp"
 #include "../io/WorldSave.hpp"
 #include "../model/Skeletons.hpp"
+#include "../ui/DirectInput.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"
 
 #include <list>
@@ -26,13 +32,14 @@ namespace client {
 class MasterState;
 
 class InteractiveState
-: public State {
+: public State
+, public ClientController {
 
 public:
        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; }
        Skeletons &GetSkeletons() noexcept { return skeletons; }
 
@@ -45,11 +52,21 @@ public:
        void PushPlayerUpdate(const Entity &, int dt);
        void MergePlayerCorrection(std::uint16_t, const EntityState &);
 
+       void SetAudio(bool) override;
+       void SetVideo(bool) override;
+       void SetHUD(bool) override;
+       void SetDebug(bool) override;
+       void Exit() override;
+
 private:
        MasterState &master;
        BlockTypeRegistry block_types;
        WorldSave save;
        World world;
+       Player &player;
+       HUD hud;
+       InteractiveManipulator manip;
+       DirectInput input;
        Interface interface;
        ChunkRequester chunk_requester;
        ChunkReceiver chunk_receiver;