penalty force collision response

[blank.git] / src / client / net.cpp

diff --git a/src/client/net.cpp b/src/client/net.cpp
index 7d8681aecd15f1a4b324bfb2614423a4f3b13808..8a4930410605b7a8eacf0ae0dd8886ef2630ad51 100644 (file)
--- a/src/client/net.cpp
+++ b/src/client/net.cpp
@@ -4,6 +4,7 @@
 #include "NetworkedInput.hpp"
 
 #include "../app/init.hpp"
+#include "../io/WorldSave.hpp"
 #include "../net/Packet.hpp"
 #include "../world/Chunk.hpp"
 #include "../world/ChunkStore.hpp"
@@ -21,8 +22,9 @@ namespace blank {
 namespace client {
 
 
-ChunkReceiver::ChunkReceiver(ChunkStore &store)
+ChunkReceiver::ChunkReceiver(ChunkStore &store, const WorldSave &save)
 : store(store)
+, save(save)
 , transmissions()
 , timer(5000) {
        timer.Start();
@@ -48,8 +50,50 @@ void ChunkReceiver::Update(int dt) {
                        }
                }
        }
+       LoadN(10);
+       StoreN(10);
 }
 
+int ChunkReceiver::ToLoad() const noexcept {
+       return store.EstimateMissing();
+}
+
+void ChunkReceiver::LoadOne() {
+       if (!store.HasMissing()) return;
+
+       Chunk::Pos pos = store.NextMissing();
+       Chunk *chunk = store.Allocate(pos);
+       if (!chunk) {
+               // chunk store corrupted?
+               return;
+       }
+
+       if (save.Exists(pos)) {
+               save.Read(*chunk);
+       }
+}
+
+void ChunkReceiver::LoadN(size_t n) {
+       size_t end = min(n, size_t(ToLoad()));
+       for (size_t i = 0; i < end && store.HasMissing(); ++i) {
+               LoadOne();
+       }
+}
+
+void ChunkReceiver::StoreN(size_t n) {
+       size_t saved = 0;
+       for (Chunk &chunk : store) {
+               if (chunk.ShouldUpdateSave()) {
+                       save.Write(chunk);
+                       ++saved;
+                       if (saved >= n) {
+                               break;
+                       }
+               }
+       }
+}
+
+
 void ChunkReceiver::Handle(const Packet::ChunkBegin &pack) {
        uint32_t id;
        pack.ReadTransmissionId(id);
@@ -244,8 +288,8 @@ uint16_t Client::SendPlayerUpdate(
        const glm::vec3 &movement,
        float pitch,
        float yaw,
-       std::uint8_t actions,
-       std::uint8_t slot
+       uint8_t actions,
+       uint8_t slot
 ) {
        auto pack = Packet::Make<Packet::PlayerUpdate>(client_pack);
        pack.WritePredictedState(prediction);
@@ -279,7 +323,7 @@ void NetworkedInput::Update(int dt) {
 void NetworkedInput::PushPlayerUpdate(int dt) {
        const EntityState &state = GetPlayer().GetEntity().GetState();
 
-       std::uint16_t packet = client.SendPlayerUpdate(
+       uint16_t packet = client.SendPlayerUpdate(
                state,
                GetMovement(),
                GetPitch(),
@@ -288,10 +332,11 @@ void NetworkedInput::PushPlayerUpdate(int dt) {
                InventorySlot()
        );
        if (player_hist.size() < 16) {
-               player_hist.emplace_back(state, dt, packet);
+               player_hist.emplace_back(state, GetPlayer().GetEntity().TargetVelocity(), dt, packet);
        } else {
                auto entry = player_hist.begin();
                entry->state = state;
+               entry->tgt_vel = GetPlayer().GetEntity().TargetVelocity();
                entry->delta_t = dt;
                entry->packet = packet;
                player_hist.splice(player_hist.end(), player_hist, entry);
@@ -334,11 +379,8 @@ void NetworkedInput::MergePlayerCorrection(uint16_t seq, const EntityState &corr
        vector<WorldCollision> col;
        while (entry != end) {
                replay.Velocity(entry->state.velocity);
-               replay.Update(entry->delta_t);
-               if (GetWorld().Intersection(replay, col)) {
-                       GetWorld().Resolve(replay, col);
-                       col.clear();
-               }
+               replay.TargetVelocity(entry->tgt_vel);
+               GetWorld().Update(replay, entry->delta_t);
                entry->state.chunk_pos = replay.GetState().chunk_pos;
                entry->state.block_pos = replay.GetState().block_pos;
                ++entry;