X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=521b149ae824185cd44fda750f9ec38c48917ba7;hb=2e3774eb3f2d5d23a08731175b168566457e2192;hp=72d860d97772e75706d8ae81e2f5df5ec90fa756;hpb=ac41db13c9d64f5ef12b26c335d57504d02fd2fd;p=blank.git

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 72d860d..521b149 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -1,3 +1,4 @@
+#include "ChunkRequester.hpp"
 #include "InitialState.hpp"
 #include "InteractiveState.hpp"
 #include "MasterState.hpp"
@@ -6,6 +7,8 @@
 #include "../app/init.hpp"
 #include "../app/TextureIndex.hpp"
 #include "../model/CompositeModel.hpp"
+#include "../io/WorldSave.hpp"
+#include "../world/ChunkStore.hpp"
 
 #include <iostream>
 #include <glm/gtx/io.hpp>
@@ -16,6 +19,63 @@ using namespace std;
 namespace blank {
 namespace client {
 
+ChunkRequester::ChunkRequester(
+	ChunkStore &store,
+	const WorldSave &save
+) noexcept
+: store(store)
+, save(save) {
+
+}
+
+void ChunkRequester::Update(int dt) {
+	// check if there's chunks waiting to be loaded
+	LoadN(10);
+
+	// store a few chunks as well
+	constexpr int max_save = 10;
+	int saved = 0;
+	for (Chunk &chunk : store) {
+		if (chunk.ShouldUpdateSave()) {
+			save.Write(chunk);
+			++saved;
+			if (saved >= max_save) {
+				break;
+			}
+		}
+	}
+}
+
+int ChunkRequester::ToLoad() const noexcept {
+	return store.EstimateMissing();
+}
+
+void ChunkRequester::LoadOne() {
+	if (!store.HasMissing()) return;
+
+	Chunk::Pos pos = store.NextMissing();
+	Chunk *chunk = store.Allocate(pos);
+	if (!chunk) {
+		// chunk store corrupted?
+		return;
+	}
+
+	if (save.Exists(pos)) {
+		save.Read(*chunk);
+		// TODO: request chunk from server with cache tag
+	} else {
+		// TODO: request chunk from server
+	}
+}
+
+void ChunkRequester::LoadN(std::size_t n) {
+	std::size_t end = std::min(n, std::size_t(ToLoad()));
+	for (std::size_t i = 0; i < end && store.HasMissing(); ++i) {
+		LoadOne();
+	}
+}
+
+
 InitialState::InitialState(MasterState &master)
 : master(master)
 , message() {
@@ -54,10 +114,17 @@ InteractiveState::InteractiveState(MasterState &master, uint32_t player_id)
 	world,
 	world.AddPlayer(master.GetInterfaceConf().player_name, player_id)
 )
+// TODO: looks like chunk requester and receiver can and should be merged
+, chunk_requester(world.Chunks(), save)
+, chunk_receiver(world.Chunks())
 , chunk_renderer(*interface.GetPlayer().chunks)
 , skeletons()
 , loop_timer(16)
+, sky(master.GetEnv().loader.LoadCubeMap("skybox"))
 , player_hist() {
+	if (!save.Exists()) {
+		save.Write(master.GetWorldConf());
+	}
 	TextureIndex tex_index;
 	master.GetEnv().loader.LoadBlockTypes("default", block_types, tex_index);
 	chunk_renderer.LoadTextures(master.GetEnv().loader, tex_index);
@@ -103,6 +170,8 @@ void InteractiveState::Handle(const SDL_Event &event) {
 void InteractiveState::Update(int dt) {
 	loop_timer.Update(dt);
 	master.Update(dt);
+	chunk_receiver.Update(dt);
+	chunk_requester.Update(dt);
 
 	interface.Update(dt);
 	int world_dt = 0;
@@ -209,6 +278,7 @@ void InteractiveState::Render(Viewport &viewport) {
 	viewport.WorldPosition(player.Transform(player.ChunkCoords()));
 	chunk_renderer.Render(viewport);
 	world.Render(viewport);
+	sky.Render(viewport);
 	interface.Render(viewport);
 }
 
@@ -328,7 +398,8 @@ void MasterState::On(const Packet::SpawnEntity &pack) {
 	if (skel) {
 		skel->Instantiate(entity.GetModel());
 	}
-	cout << "spawned entity " << entity.Name() << " at " << entity.AbsolutePosition() << endl;
+	cout << "spawned entity #" << entity_id << "  (" << entity.Name()
+		<< ") at " << entity.AbsolutePosition() << endl;
 }
 
 void MasterState::On(const Packet::DespawnEntity &pack) {
@@ -343,7 +414,7 @@ void MasterState::On(const Packet::DespawnEntity &pack) {
 	for (Entity &entity : state->GetWorld().Entities()) {
 		if (entity.ID() == entity_id) {
 			entity.Kill();
-			cout << "despawned entity " << entity.Name() << " at " << entity.AbsolutePosition() << endl;
+			cout << "despawned entity #" << entity_id << " (" << entity.Name() << ") at " << entity.AbsolutePosition() << endl;
 			return;
 		}
 	}
@@ -388,7 +459,7 @@ bool MasterState::UpdateEntity(uint32_t entity_id, uint16_t seq) {
 		return true;
 	}
 
-	int pack_diff = int16_t(seq) - int16_t(entry->second.last_packet);
+	int16_t 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();
 
@@ -417,5 +488,23 @@ void MasterState::On(const Packet::PlayerCorrection &pack) {
 	state->MergePlayerCorrection(pack_seq, corrected_state);
 }
 
+void MasterState::On(const Packet::ChunkBegin &pack) {
+	if (!state) {
+		cout << "got chunk data, but the world has not been created yet" << endl;
+		cout << "great, this will totally screw up everything :(" << endl;
+		return;
+	}
+	state->GetChunkReceiver().Handle(pack);
+}
+
+void MasterState::On(const Packet::ChunkData &pack) {
+	if (!state) {
+		cout << "got chunk data, but the world has not been created yet" << endl;
+		cout << "great, this will totally screw up everything :(" << endl;
+		return;
+	}
+	state->GetChunkReceiver().Handle(pack);
+}
+
 }
 }