#include "NetworkedInput.hpp"
#include "../app/init.hpp"
+#include "../geometry/distance.hpp"
+#include "../io/WorldSave.hpp"
#include "../net/Packet.hpp"
#include "../world/Chunk.hpp"
#include "../world/ChunkStore.hpp"
#include "../world/Player.hpp"
+#include "../world/World.hpp"
#include <iostream>
#include <zlib.h>
namespace client {
-ChunkReceiver::ChunkReceiver(ChunkStore &store)
+ChunkReceiver::ChunkReceiver(ChunkStore &store, const WorldSave &save)
: store(store)
+, save(save)
, transmissions()
, timer(5000) {
timer.Start();
}
}
}
+ LoadN(10);
+ StoreN(10);
}
+int ChunkReceiver::ToLoad() const noexcept {
+ return store.EstimateMissing();
+}
+
+void ChunkReceiver::LoadOne() {
+ if (!store.HasMissing()) return;
+
+ ExactLocation::Coarse 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);
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);
pack.WriteMovement(movement);
- pack.WritePitch(pitch);
- pack.WriteYaw(yaw);
pack.WriteActions(actions);
pack.WriteSlot(slot);
return conn.Send(client_pack, client_sock);
return conn.Send(client_pack, client_sock);
}
+uint16_t Client::SendMessage(
+ uint8_t type,
+ uint32_t ref,
+ const string &msg
+) {
+ auto pack = Packet::Make<Packet::Message>(client_pack);
+ pack.WriteType(type);
+ pack.WriteReferral(ref);
+ pack.WriteMessage(msg);
+ client_pack.len = sizeof(Packet::Header) + Packet::Message::GetSize(msg);
+ return conn.Send(client_pack, client_sock);
+}
NetworkedInput::NetworkedInput(World &world, Player &player, Client &client)
: PlayerController(world, player)
, client(client)
, player_hist()
+, old_movement(0.0f)
+, old_actions(0)
, actions(0) {
}
-void NetworkedInput::Update(int dt) {
+bool NetworkedInput::UpdateImportant() const noexcept {
+ return old_actions != actions || !iszero(old_movement - GetMovement());
+}
+
+void NetworkedInput::Update(Entity &, float dt) {
Invalidate();
UpdatePlayer();
}
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(),
InventorySlot()
);
if (player_hist.size() < 16) {
- player_hist.emplace_back(state, dt, packet);
+ player_hist.emplace_back(state, GetMovement(), dt * 0.001f, packet);
} else {
auto entry = player_hist.begin();
entry->state = state;
- entry->delta_t = dt;
+ entry->movement = GetMovement();
+ entry->delta_t = dt * 0.001f;
entry->packet = packet;
player_hist.splice(player_hist.end(), player_hist, entry);
}
+ old_movement = GetMovement();
+ old_actions = actions;
}
void NetworkedInput::MergePlayerCorrection(uint16_t seq, const EntityState &corrected_state) {
}
}
- EntityState replay_state(corrected_state);
- EntityState &player_state = GetPlayer().GetEntity().GetState();
+ glm::vec3 restore_movement(GetMovement());
+
+ EntityState player_state = GetPlayer().GetEntity().GetState();
+ Entity replay(GetPlayer().GetEntity());
+ replay.SetState(corrected_state);
if (entry != end) {
- entry->state.chunk_pos = replay_state.chunk_pos;
- entry->state.block_pos = replay_state.block_pos;
+ entry->state.pos = replay.GetState().pos;
++entry;
}
+ vector<WorldCollision> col;
while (entry != end) {
- replay_state.velocity = entry->state.velocity;
- replay_state.Update(entry->delta_t);
- entry->state.chunk_pos = replay_state.chunk_pos;
- entry->state.block_pos = replay_state.block_pos;
+ SetMovement(entry->movement);
+ GetWorld().Update(replay, entry->delta_t);
+ entry->state.pos = replay.GetState().pos;
++entry;
}
- glm::vec3 displacement(replay_state.Diff(player_state));
+ glm::vec3 displacement(replay.GetState().Diff(player_state));
const float disp_squared = dot(displacement, displacement);
if (disp_squared < 16.0f * numeric_limits<float>::epsilon()) {
+ SetMovement(restore_movement);
return;
}
constexpr float max_disp = 0.0001f; // (1/100)^2
if (disp_squared > warp_thresh) {
- player_state.chunk_pos = replay_state.chunk_pos;
- player_state.block_pos = replay_state.block_pos;
+ player_state.pos = replay.GetState().pos;
} else if (disp_squared < max_disp) {
- player_state.block_pos += displacement;
+ player_state.pos.block += displacement;
} else {
displacement *= 0.01f / sqrt(disp_squared);
- player_state.block_pos += displacement;
+ player_state.pos.block += displacement;
}
+ GetPlayer().GetEntity().SetState(player_state);
+ SetMovement(restore_movement);
}
void NetworkedInput::StartPrimaryAction() {