X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=4a48b45afc91eb5179f9a6d038c88b19244f213d;hb=8507332e2d0c54aec4045fb6f0021bdc3bd57750;hp=96c30f5b1d15d8ca3229e7a701cfa1211b60a21d;hpb=d4c71969df4f6b5e6b750c98268d30ca6784908b;p=blank.git

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 96c30f5..4a48b45 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -55,7 +55,9 @@ InteractiveState::InteractiveState(MasterState &master, uint32_t player_id)
 	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);
@@ -63,6 +65,7 @@ InteractiveState::InteractiveState(MasterState &master, uint32_t player_id)
 	skeletons.Load();
 	// TODO: better solution for initializing HUD
 	interface.SelectNext();
+	update_timer.Start();
 }
 
 void InteractiveState::OnEnter() {
@@ -104,9 +107,13 @@ void InteractiveState::Update(int dt) {
 	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));
@@ -116,6 +123,37 @@ void InteractiveState::Update(int dt) {
 	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()));
@@ -137,8 +175,11 @@ MasterState::MasterState(
 , 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() {
@@ -161,6 +202,7 @@ void MasterState::Handle(const SDL_Event &event) {
 
 
 void MasterState::Update(int dt) {
+	update_timer.Update(dt);
 	client.Handle();
 	client.Update(dt);
 }
@@ -194,13 +236,15 @@ void MasterState::On(const Packet::Join &pack) {
 	} 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());
@@ -225,20 +269,16 @@ void MasterState::On(const Packet::SpawnEntity &pack) {
 	}
 	uint32_t entity_id;
 	pack.ReadEntityID(entity_id);
-	Entity *entity = state->GetWorld().AddEntity(entity_id);
-	if (!entity) {
-		cout << "entity ID inconsistency" << endl;
-		Quit();
-		return;
-	}
-	pack.ReadEntity(*entity);
+	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());
+		skel->Instantiate(entity.GetModel());
 	}
-	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) {
@@ -249,6 +289,7 @@ 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();
@@ -283,10 +324,48 @@ void MasterState::On(const Packet::EntityUpdate &pack) {
 			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);
+}
+
 }
 }