X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=b79c435473e946de841c7353cb2fb37870923c87;hb=69a4ba4fa3e4694887087ab6dddc784a593d2b03;hp=26e0e0df748c64cd70f0807ae00e90b4bb7d1dbf;hpb=10a310869c61cc52046e165f36ac9639fe9d0c69;p=blank.git

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 26e0e0d..b79c435 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -4,6 +4,7 @@
 
 #include "../app/Environment.hpp"
 #include "../app/init.hpp"
+#include "../geometry/distance.hpp"
 #include "../model/Model.hpp"
 #include "../io/WorldSave.hpp"
 #include "../world/ChunkIndex.hpp"
@@ -56,12 +57,15 @@ InteractiveState::InteractiveState(MasterState &master, uint32_t player_id)
 , manip(master.GetEnv().audio, sounds, player.GetEntity())
 , input(world, player, master.GetClient())
 , interface(master.GetConfig(), master.GetEnv().keymap, input, *this)
-, chunk_receiver(world.Chunks(), save)
+, chunk_receiver(master.GetClient(), world.Chunks(), save)
 , chunk_renderer(player.GetChunks())
 , loop_timer(16)
+, stat_timer(1000)
 , sky(master.GetEnv().loader.LoadCubeMap("skybox"))
 , update_status()
-, chat(master.GetEnv(), *this, *this) {
+, chat(master.GetEnv(), *this, *this)
+, time_skipped(0)
+, packets_skipped(0) {
 	if (!save.Exists()) {
 		save.Write(master.GetWorldConf());
 	}
@@ -75,9 +79,7 @@ InteractiveState::InteractiveState(MasterState &master, uint32_t player_id)
 	chunk_renderer.LoadTextures(master.GetEnv().loader, res.tex_index);
 	chunk_renderer.FogDensity(master.GetWorldConf().fog_density);
 	loop_timer.Start();
-	if (save.Exists(player)) {
-		save.Read(player);
-	}
+	stat_timer.Start();
 }
 
 void InteractiveState::OnResume() {
@@ -141,6 +143,7 @@ void InteractiveState::Handle(const SDL_Event &event) {
 
 void InteractiveState::Update(int dt) {
 	loop_timer.Update(dt);
+	stat_timer.Update(dt);
 	master.Update(dt);
 	chunk_receiver.Update(dt);
 
@@ -155,14 +158,24 @@ void InteractiveState::Update(int dt) {
 	if (input.BlockFocus()) {
 		hud.FocusBlock(input.BlockFocus().GetChunk(), input.BlockFocus().block);
 	} else if (input.EntityFocus()) {
-		hud.FocusEntity(*input.EntityFocus().entity);
+		hud.FocusEntity(input.EntityFocus().GetEntity());
 	} else {
 		hud.FocusNone();
 	}
 	if (world_dt > 0) {
-		input.PushPlayerUpdate(world_dt);
+		if (input.UpdateImportant() || packets_skipped >= master.NetStat().SuggestedPacketSkip()) {
+			input.PushPlayerUpdate(time_skipped + world_dt);
+			time_skipped = 0;
+			packets_skipped = 0;
+		} else {
+			time_skipped += world_dt;
+			++packets_skipped;
+		}
 	}
 	hud.Display(res.block_types[player.GetInventorySlot() + 1]);
+	if (stat_timer.Hit()) {
+		hud.UpdateNetStats(master.NetStat());
+	}
 	hud.Update(dt);
 
 	glm::mat4 trans = player.GetEntity().Transform(player.GetEntity().ChunkCoords());
@@ -174,12 +187,13 @@ void InteractiveState::Update(int dt) {
 }
 
 void InteractiveState::Render(Viewport &viewport) {
-	viewport.WorldPosition(
-		player.GetEntity().Transform(player.GetEntity().ChunkCoords())
-		* player.GetEntity().GetModel().EyesTransform());
+	viewport.WorldPosition(player.GetEntity().ViewTransform(player.GetEntity().ChunkCoords()));
 	if (master.GetConfig().video.world) {
 		chunk_renderer.Render(viewport);
 		world.Render(viewport);
+		if (master.GetConfig().video.debug) {
+			world.RenderDebug(viewport);
+		}
 		sky.Render(viewport);
 	}
 	hud.Render(viewport);
@@ -196,8 +210,6 @@ void InteractiveState::Handle(const Packet::SpawnEntity &pack) {
 	if (model_id > 0 && model_id <= res.models.size()) {
 		res.models.Get(model_id).Instantiate(entity.GetModel());
 	}
-	cout << "spawned entity #" << entity_id << "  (" << entity.Name()
-		<< ") at " << entity.AbsolutePosition() << endl;
 }
 
 void InteractiveState::Handle(const Packet::DespawnEntity &pack) {
@@ -207,7 +219,6 @@ void InteractiveState::Handle(const Packet::DespawnEntity &pack) {
 	for (Entity &entity : world.Entities()) {
 		if (entity.ID() == entity_id) {
 			entity.Kill();
-			cout << "despawned entity #" << entity_id << " (" << entity.Name() << ") at " << entity.AbsolutePosition() << endl;
 			return;
 		}
 	}
@@ -337,6 +348,14 @@ void InteractiveState::SetDebug(bool b) {
 	}
 }
 
+void InteractiveState::NextCamera() {
+	if (iszero(master.GetEnv().viewport.CameraOffset())) {
+		master.GetEnv().viewport.OffsetCamera(glm::vec3(0.0f, 0.0f, -5.0f));
+	} else {
+		master.GetEnv().viewport.OffsetCamera(glm::vec3(0.0f, 0.0f, 0.0f));
+	}
+}
+
 void InteractiveState::Exit() {
 	save.Write(player);
 	master.Quit();