#include "../app/Environment.hpp"
#include "../app/init.hpp"
#include "../app/TextureIndex.hpp"
+#include "../model/CompositeModel.hpp"
#include <iostream>
#include <glm/gtx/io.hpp>
world,
world.AddPlayer(master.GetInterfaceConf().player_name, player_id)
)
-, chunk_renderer(*interface.GetPlayer().chunks) {
+, chunk_renderer(*interface.GetPlayer().chunks)
+, 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);
chunk_renderer.FogDensity(master.GetWorldConf().fog_density);
+ 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()));
, state()
, client(cc)
, init_state(*this)
-, login_packet(-1) {
+, login_packet(-1)
+, update_status()
+, update_timer(16) {
client.GetConnection().SetHandler(this);
+ update_timer.Start();
}
void MasterState::Quit() {
void MasterState::Update(int dt) {
+ update_timer.Update(dt);
client.Handle();
client.Update(dt);
}
} else {
// joining game
cout << "joined game \"" << world_conf.name << '"' << endl;
+ // server received our login
+ login_packet = -1;
}
uint32_t player_id;
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());
}
uint32_t entity_id;
pack.ReadEntityID(entity_id);
- Entity *entity = state->GetWorld().AddEntity(entity_id);
- if (!entity) {
- cout << "entity ID inconsistency" << endl;
- Quit();
- return;
+ Entity &entity = state->GetWorld().ForceAddEntity(entity_id);
+ UpdateEntity(entity_id, pack.Seq());
+ pack.ReadEntity(entity);
+ uint32_t skel_id;
+ pack.ReadSkeletonID(skel_id);
+ CompositeModel *skel = state->GetSkeletons().ByID(skel_id);
+ if (skel) {
+ skel->Instantiate(entity.GetModel());
}
- pack.ReadEntity(*entity);
- cout << "spawned entity " << entity->Name() << " at " << entity->AbsolutePosition() << endl;
+ cout << "spawned entity " << entity.Name() << " at " << entity.AbsolutePosition() << endl;
}
void MasterState::On(const Packet::DespawnEntity &pack) {
}
uint32_t entity_id;
pack.ReadEntityID(entity_id);
+ ClearEntity(entity_id);
for (Entity &entity : state->GetWorld().Entities()) {
if (entity.ID() == entity_id) {
entity.Kill();
return;
}
if (world_iter->ID() == entity_id) {
- pack.ReadEntity(*world_iter, i);
+ if (UpdateEntity(entity_id, pack.Seq())) {
+ pack.ReadEntityState(world_iter->GetState(), i);
+ }
}
}
}
+bool MasterState::UpdateEntity(uint32_t entity_id, uint16_t seq) {
+ auto entry = update_status.find(entity_id);
+ if (entry == update_status.end()) {
+ update_status.emplace(entity_id, UpdateStatus{ seq, update_timer.Elapsed() });
+ return true;
+ }
+
+ int pack_diff = int16_t(seq) - int16_t(entry->second.last_packet);
+ int time_diff = update_timer.Elapsed() - entry->second.last_update;
+ entry->second.last_update = update_timer.Elapsed();
+
+ if (pack_diff > 0 || time_diff > 1500) {
+ entry->second.last_packet = seq;
+ return true;
+ } else {
+ return false;
+ }
+}
+
+void MasterState::ClearEntity(uint32_t entity_id) {
+ 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);
+}
+
}
}