world.AddPlayer(master.GetInterfaceConf().player_name, player_id)
)
, chunk_renderer(*interface.GetPlayer().chunks)
-, skeletons() {
+, skeletons()
+, update_timer(16)
+, player_hist() {
TextureIndex tex_index;
master.GetEnv().loader.LoadBlockTypes("default", block_types, tex_index);
chunk_renderer.LoadTextures(master.GetEnv().loader, tex_index);
skeletons.Load();
// TODO: better solution for initializing HUD
interface.SelectNext();
+ update_timer.Start();
}
void InteractiveState::OnEnter() {
world.Update(dt);
chunk_renderer.Update(dt);
+ update_timer.Update(dt);
+
Entity &player = *interface.GetPlayer().entity;
- master.GetClient().SendPlayerUpdate(player);
+ if (update_timer.Hit()) {
+ PushPlayerUpdate(player);
+ }
glm::mat4 trans = player.Transform(player.ChunkCoords());
glm::vec3 dir(trans * glm::vec4(0.0f, 0.0f, -1.0f, 0.0f));
master.GetEnv().audio.Orientation(dir, up);
}
+void InteractiveState::PushPlayerUpdate(const Entity &player) {
+ std::uint16_t packet = master.GetClient().SendPlayerUpdate(player);
+ if (player_hist.size() < 16) {
+ player_hist.emplace_back(player.GetState(), update_timer.Elapsed(), packet);
+ } else {
+ auto entry = player_hist.begin();
+ entry->state = player.GetState();
+ entry->timestamp = update_timer.Elapsed();
+ entry->packet = packet;
+ player_hist.splice(player_hist.end(), player_hist, entry);
+ }
+}
+
+void InteractiveState::MergePlayerCorrection(uint16_t seq, const EntityState &corrected_state) {
+ if (player_hist.empty()) return;
+
+ auto entry = player_hist.begin();
+ auto end = player_hist.end();
+
+ // drop anything older than the fix
+ while (entry != end) {
+ int pack_diff = int16_t(seq) - int16_t(entry->packet);
+ if (pack_diff < 0) {
+ entry = player_hist.erase(entry);
+ } else {
+ break;
+ }
+ }
+ if (entry == end) return;
+}
+
void InteractiveState::Render(Viewport &viewport) {
Entity &player = *interface.GetPlayer().entity;
viewport.WorldPosition(player.Transform(player.ChunkCoords()));
pack.ReadPlayerID(player_id);
state.reset(new InteractiveState(*this, player_id));
- pack.ReadPlayer(*state->GetInterface().GetPlayer().entity);
+ pack.ReadPlayerState(state->GetInterface().GetPlayer().entity->GetState());
env.state.PopAfter(this);
env.state.Push(state.get());
}
if (world_iter->ID() == entity_id) {
if (UpdateEntity(entity_id, pack.Seq())) {
- pack.ReadEntity(*world_iter, i);
+ pack.ReadEntityState(world_iter->GetState(), i);
}
}
}
update_status.erase(entity_id);
}
+void MasterState::On(const Packet::PlayerCorrection &pack) {
+ if (!state) {
+ cout << "got player correction without a player :S" << endl;
+ Quit();
+ return;
+ }
+ uint16_t pack_seq;
+ EntityState corrected_state;
+ pack.ReadPacketSeq(pack_seq);
+ pack.ReadPlayerState(corrected_state);
+ state->MergePlayerCorrection(pack_seq, corrected_state);
+}
+
}
}