X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fclient%2FInteractiveState.hpp;h=39b393a578032e3e4aac22cb64153d8fcefd911f;hb=ae5a7e7d8517fac406a88e9bf98fd3d5bb1728b9;hp=eaca4c9c78880d8679755c24d71f2558f7ea1977;hpb=896c4c0ba2efd6774894fd8308cc097b7f4123e3;p=blank.git diff --git a/src/client/InteractiveState.hpp b/src/client/InteractiveState.hpp index eaca4c9..39b393a 100644 --- a/src/client/InteractiveState.hpp +++ b/src/client/InteractiveState.hpp @@ -5,6 +5,7 @@ #include "../app/State.hpp" #include "../io/WorldSave.hpp" #include "../model/Skeletons.hpp" +#include "../net/ChunkReceiver.hpp" #include "../ui/Interface.hpp" #include "../world/BlockTypeRegistry.hpp" #include "../world/ChunkRenderer.hpp" @@ -30,6 +31,7 @@ public: World &GetWorld() noexcept { return world; } Interface &GetInterface() noexcept { return interface; } + ChunkReceiver &GetChunkReceiver() noexcept { return chunk_receiver; } Skeletons &GetSkeletons() noexcept { return skeletons; } void OnEnter() override; @@ -38,7 +40,7 @@ public: void Update(int dt) override; void Render(Viewport &) override; - void PushPlayerUpdate(const Entity &); + void PushPlayerUpdate(const Entity &, int dt); void MergePlayerCorrection(std::uint16_t, const EntityState &); private: @@ -47,16 +49,17 @@ private: WorldSave save; World world; Interface interface; + ChunkReceiver chunk_receiver; ChunkRenderer chunk_renderer; Skeletons skeletons; IntervalTimer loop_timer; - IntervalTimer update_timer; struct PlayerHistory { EntityState state; + int delta_t; std::uint16_t packet; - PlayerHistory(EntityState s, std::uint16_t p) - : state(s), packet(p) { } + PlayerHistory(EntityState s, int dt, std::uint16_t p) + : state(s), delta_t(dt), packet(p) { } }; std::list player_hist;