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);
}
-void NetworkedInput::Update(int dt) {
+void NetworkedInput::Update(Entity &, float dt) {
Invalidate();
UpdatePlayer();
}
InventorySlot()
);
if (player_hist.size() < 16) {
- player_hist.emplace_back(state, GetPlayer().GetEntity().TargetVelocity(), dt * 0.001f, packet);
+ player_hist.emplace_back(state, GetMovement(), dt * 0.001f, packet);
} else {
auto entry = player_hist.begin();
entry->state = state;
- entry->tgt_vel = GetPlayer().GetEntity().TargetVelocity();
+ entry->movement = GetMovement();
entry->delta_t = dt * 0.001f;
entry->packet = packet;
player_hist.splice(player_hist.end(), player_hist, entry);
}
}
- 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);
vector<WorldCollision> col;
while (entry != end) {
replay.Velocity(entry->state.velocity);
- replay.TargetVelocity(entry->tgt_vel);
+ SetMovement(entry->movement);
GetWorld().Update(replay, entry->delta_t);
entry->state.chunk_pos = replay.GetState().chunk_pos;
entry->state.block_pos = replay.GetState().block_pos;
const float disp_squared = dot(displacement, displacement);
if (disp_squared < 16.0f * numeric_limits<float>::epsilon()) {
+ SetMovement(restore_movement);
return;
}
displacement *= 0.01f / sqrt(disp_squared);
player_state.block_pos += displacement;
}
+ GetPlayer().GetEntity().SetState(player_state);
+ SetMovement(restore_movement);
}
void NetworkedInput::StartPrimaryAction() {