X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=cc3106f8e34a08be63d49f9ce789d83480da3f74;hb=7e782291e0ce39eb2d4e8c1df28f682c313e6f8d;hp=1978f3929c5b623ef987d224fe3ed2e9e5ffcaa9;hpb=d5ef462f3bd70a9717c1309466ce8d90b038c5cd;p=blank.git

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 1978f39..cc3106f 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -5,7 +5,7 @@
 #include "../app/Environment.hpp"
 #include "../app/init.hpp"
 #include "../app/TextureIndex.hpp"
-#include "../model/CompositeModel.hpp"
+#include "../model/Model.hpp"
 #include "../io/WorldSave.hpp"
 #include "../world/ChunkIndex.hpp"
 #include "../world/ChunkStore.hpp"
@@ -48,7 +48,9 @@ void InitialState::Render(Viewport &viewport) {
 // TODO: this clutter is a giant mess
 InteractiveState::InteractiveState(MasterState &master, uint32_t player_id)
 : master(master)
+, shapes()
 , block_types()
+, models()
 , save(master.GetEnv().config.GetWorldPath(master.GetWorldConf().name, master.GetConfig().net.host))
 , world(block_types, master.GetWorldConf())
 , player(*world.AddPlayer(master.GetConfig().player.name))
@@ -58,18 +60,19 @@ InteractiveState::InteractiveState(MasterState &master, uint32_t player_id)
 , interface(master.GetConfig(), master.GetEnv().keymap, input, *this)
 , chunk_receiver(world.Chunks(), save)
 , chunk_renderer(player.GetChunks())
-, skeletons()
 , loop_timer(16)
-, sky(master.GetEnv().loader.LoadCubeMap("skybox")) {
+, sky(master.GetEnv().loader.LoadCubeMap("skybox"))
+, update_status() {
 	if (!save.Exists()) {
 		save.Write(master.GetWorldConf());
 	}
 	TextureIndex tex_index;
-	master.GetEnv().loader.LoadBlockTypes("default", block_types, tex_index);
+	master.GetEnv().loader.LoadShapes("default", shapes);
+	master.GetEnv().loader.LoadBlockTypes("default", block_types, tex_index, shapes);
+	master.GetEnv().loader.LoadModels("default", models, tex_index, shapes);
 	interface.SetInventorySlots(block_types.size() - 1);
 	chunk_renderer.LoadTextures(master.GetEnv().loader, tex_index);
 	chunk_renderer.FogDensity(master.GetWorldConf().fog_density);
-	skeletons.Load();
 	loop_timer.Start();
 	if (save.Exists(player)) {
 		save.Read(player);
@@ -153,8 +156,90 @@ void InteractiveState::Render(Viewport &viewport) {
 	hud.Render(viewport);
 }
 
-void InteractiveState::MergePlayerCorrection(std::uint16_t pack, const EntityState &state) {
-	input.MergePlayerCorrection(pack, state);
+void InteractiveState::Handle(const Packet::SpawnEntity &pack) {
+	uint32_t entity_id;
+	pack.ReadEntityID(entity_id);
+	Entity &entity = world.ForceAddEntity(entity_id);
+	UpdateEntity(entity_id, pack.Seq());
+	pack.ReadEntity(entity);
+	uint32_t skel_id;
+	pack.ReadSkeletonID(skel_id);
+	if (skel_id > 0 && skel_id <= models.size()) {
+		Model &skel = models.Get(skel_id);
+		skel.Instantiate(entity.GetModel());
+	}
+	cout << "spawned entity #" << entity_id << "  (" << entity.Name()
+		<< ") at " << entity.AbsolutePosition() << endl;
+}
+
+void InteractiveState::Handle(const Packet::DespawnEntity &pack) {
+	uint32_t entity_id;
+	pack.ReadEntityID(entity_id);
+	ClearEntity(entity_id);
+	for (Entity &entity : world.Entities()) {
+		if (entity.ID() == entity_id) {
+			entity.Kill();
+			cout << "despawned entity #" << entity_id << " (" << entity.Name() << ") at " << entity.AbsolutePosition() << endl;
+			return;
+		}
+	}
+}
+
+void InteractiveState::Handle(const Packet::EntityUpdate &pack) {
+	auto world_iter = world.Entities().begin();
+	auto world_end = world.Entities().end();
+
+	uint32_t count = 0;
+	pack.ReadEntityCount(count);
+
+	for (uint32_t i = 0; i < count; ++i) {
+		uint32_t entity_id = 0;
+		pack.ReadEntityID(entity_id, i);
+
+		while (world_iter != world_end && world_iter->ID() < entity_id) {
+			++world_iter;
+		}
+		if (world_iter == world_end) {
+			// nothing can be done from here
+			return;
+		}
+		if (world_iter->ID() == entity_id) {
+			if (UpdateEntity(entity_id, pack.Seq())) {
+				pack.ReadEntityState(world_iter->GetState(), i);
+			}
+		}
+	}
+}
+
+bool InteractiveState::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, loop_timer.Elapsed() });
+		return true;
+	}
+
+	int16_t pack_diff = int16_t(seq) - int16_t(entry->second.last_packet);
+	int time_diff = loop_timer.Elapsed() - entry->second.last_update;
+	entry->second.last_update = loop_timer.Elapsed();
+
+	if (pack_diff > 0 || time_diff > 1500) {
+		entry->second.last_packet = seq;
+		return true;
+	} else {
+		return false;
+	}
+}
+
+void InteractiveState::ClearEntity(uint32_t entity_id) {
+	update_status.erase(entity_id);
+}
+
+void InteractiveState::Handle(const Packet::PlayerCorrection &pack) {
+	uint16_t pack_seq;
+	EntityState corrected_state;
+	pack.ReadPacketSeq(pack_seq);
+	pack.ReadPlayerState(corrected_state);
+	input.MergePlayerCorrection(pack_seq, corrected_state);
 }
 
 void InteractiveState::Handle(const Packet::BlockUpdate &pack) {
@@ -230,11 +315,8 @@ MasterState::MasterState(
 , state()
 , client(config.net)
 , init_state(*this)
-, login_packet(-1)
-, update_status()
-, update_timer(16) {
+, login_packet(-1) {
 	client.GetConnection().SetHandler(this);
-	update_timer.Start();
 }
 
 void MasterState::Quit() {
@@ -257,7 +339,6 @@ void MasterState::Handle(const SDL_Event &event) {
 
 
 void MasterState::Update(int dt) {
-	update_timer.Update(dt);
 	client.Handle();
 	client.Update(dt);
 }
@@ -320,19 +401,7 @@ void MasterState::On(const Packet::SpawnEntity &pack) {
 		cout << "got entity spawn before world was created" << endl;
 		return;
 	}
-	uint32_t entity_id;
-	pack.ReadEntityID(entity_id);
-	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());
-	}
-	cout << "spawned entity #" << entity_id << "  (" << entity.Name()
-		<< ") at " << entity.AbsolutePosition() << endl;
+	state->Handle(pack);
 }
 
 void MasterState::On(const Packet::DespawnEntity &pack) {
@@ -340,16 +409,7 @@ void MasterState::On(const Packet::DespawnEntity &pack) {
 		cout << "got entity despawn before world was created" << endl;
 		return;
 	}
-	uint32_t entity_id;
-	pack.ReadEntityID(entity_id);
-	ClearEntity(entity_id);
-	for (Entity &entity : state->GetWorld().Entities()) {
-		if (entity.ID() == entity_id) {
-			entity.Kill();
-			cout << "despawned entity #" << entity_id << " (" << entity.Name() << ") at " << entity.AbsolutePosition() << endl;
-			return;
-		}
-	}
+	state->Handle(pack);
 }
 
 void MasterState::On(const Packet::EntityUpdate &pack) {
@@ -357,53 +417,7 @@ void MasterState::On(const Packet::EntityUpdate &pack) {
 		cout << "got entity update before world was created" << endl;
 		return;
 	}
-
-	auto world_iter = state->GetWorld().Entities().begin();
-	auto world_end = state->GetWorld().Entities().end();
-
-	uint32_t count = 0;
-	pack.ReadEntityCount(count);
-
-	for (uint32_t i = 0; i < count; ++i) {
-		uint32_t entity_id = 0;
-		pack.ReadEntityID(entity_id, i);
-
-		while (world_iter != world_end && world_iter->ID() < entity_id) {
-			++world_iter;
-		}
-		if (world_iter == world_end) {
-			// nothing can be done from here
-			return;
-		}
-		if (world_iter->ID() == entity_id) {
-			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;
-	}
-
-	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();
-
-	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);
+	state->Handle(pack);
 }
 
 void MasterState::On(const Packet::PlayerCorrection &pack) {
@@ -411,11 +425,7 @@ void MasterState::On(const Packet::PlayerCorrection &pack) {
 		cout << "got player correction without a player :S" << endl;
 		return;
 	}
-	uint16_t pack_seq;
-	EntityState corrected_state;
-	pack.ReadPacketSeq(pack_seq);
-	pack.ReadPlayerState(corrected_state);
-	state->MergePlayerCorrection(pack_seq, corrected_state);
+	state->Handle(pack);
 }
 
 void MasterState::On(const Packet::ChunkBegin &pack) {