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

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 2618d98..b79c435 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -4,7 +4,7 @@
 
 #include "../app/Environment.hpp"
 #include "../app/init.hpp"
-#include "../app/TextureIndex.hpp"
+#include "../geometry/distance.hpp"
 #include "../model/Model.hpp"
 #include "../io/WorldSave.hpp"
 #include "../world/ChunkIndex.hpp"
@@ -48,48 +48,75 @@ 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()
+, res()
+, sounds()
 , save(master.GetEnv().config.GetWorldPath(master.GetWorldConf().name, master.GetConfig().net.host))
-, world(block_types, master.GetWorldConf())
-, player(*world.AddPlayer(master.GetConfig().player.name))
+, world(res.block_types, master.GetWorldConf())
+, player(*world.AddPlayer(master.GetConfig().player.name, player_id))
 , hud(master.GetEnv(), master.GetConfig(), player)
-, manip(master.GetEnv(), player.GetEntity())
+, 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())
-, skeletons()
 , loop_timer(16)
+, stat_timer(1000)
 , sky(master.GetEnv().loader.LoadCubeMap("skybox"))
-, tex_map()
-, update_status() {
+, update_status()
+, chat(master.GetEnv(), *this, *this)
+, time_skipped(0)
+, packets_skipped(0) {
 	if (!save.Exists()) {
 		save.Write(master.GetWorldConf());
 	}
-	TextureIndex tex_index;
-	master.GetEnv().loader.LoadShapes("default", shapes);
-	master.GetEnv().loader.LoadBlockTypes("default", block_types, tex_index, shapes);
-	skeletons.Load(shapes);
-	tex_map.push_back(tex_index.GetID("rock-1"));
-	tex_map.push_back(tex_index.GetID("rock-face"));
-	interface.SetInventorySlots(block_types.size() - 1);
-	chunk_renderer.LoadTextures(master.GetEnv().loader, tex_index);
+	res.Load(master.GetEnv().loader, "default");
+	if (res.models.size() < 1) {
+		throw std::runtime_error("need at least one model to run");
+	}
+	res.models[0].Instantiate(player.GetEntity().GetModel());
+	sounds.Load(master.GetEnv().loader, res.snd_index);
+	interface.SetInventorySlots(res.block_types.size() - 1);
+	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() {
+	OnFocus();
+}
+
+void InteractiveState::OnPause() {
+	OnBlur();
+}
+
+void InteractiveState::OnFocus() {
+	if (master.GetConfig().input.mouse) {
+		master.GetEnv().window.GrabMouse();
 	}
+	interface.Unlock();
 }
 
-void InteractiveState::OnEnter() {
-	master.GetEnv().window.GrabMouse();
+void InteractiveState::OnBlur() {
+	master.GetEnv().window.ReleaseMouse();
+	interface.Lock();
 }
 
 void InteractiveState::Handle(const SDL_Event &event) {
 	switch (event.type) {
 		case SDL_KEYDOWN:
-			interface.HandlePress(event.key);
+			// TODO: move to interface
+			if (event.key.keysym.sym == SDLK_RETURN) {
+				chat.Clear();
+				master.GetEnv().state.Push(&chat);
+				hud.KeepMessages(true);
+			} else if (event.key.keysym.sym == SDLK_SLASH) {
+				chat.Preset("/");
+				master.GetEnv().state.Push(&chat);
+				hud.KeepMessages(true);
+			} else {
+				interface.HandlePress(event.key);
+			}
 			break;
 		case SDL_KEYUP:
 			interface.HandleRelease(event.key);
@@ -115,20 +142,11 @@ void InteractiveState::Handle(const SDL_Event &event) {
 }
 
 void InteractiveState::Update(int dt) {
-	input.Update(dt);
-	if (input.BlockFocus()) {
-		hud.FocusBlock(input.BlockFocus().GetChunk(), input.BlockFocus().block);
-	} else if (input.EntityFocus()) {
-		hud.FocusEntity(*input.EntityFocus().entity);
-	} else {
-		hud.FocusNone();
-	}
-	hud.Display(block_types[player.GetInventorySlot() + 1]);
 	loop_timer.Update(dt);
+	stat_timer.Update(dt);
 	master.Update(dt);
 	chunk_receiver.Update(dt);
 
-	hud.Update(dt);
 	int world_dt = 0;
 	while (loop_timer.HitOnce()) {
 		world.Update(loop_timer.Interval());
@@ -137,9 +155,28 @@ void InteractiveState::Update(int dt) {
 	}
 	chunk_renderer.Update(dt);
 
+	if (input.BlockFocus()) {
+		hud.FocusBlock(input.BlockFocus().GetChunk(), input.BlockFocus().block);
+	} else if (input.EntityFocus()) {
+		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());
 	glm::vec3 dir(trans * glm::vec4(0.0f, 0.0f, -1.0f, 0.0f));
@@ -150,10 +187,13 @@ void InteractiveState::Update(int dt) {
 }
 
 void InteractiveState::Render(Viewport &viewport) {
-	viewport.WorldPosition(player.GetEntity().Transform(player.GetEntity().ChunkCoords()));
+	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);
@@ -165,15 +205,11 @@ void InteractiveState::Handle(const Packet::SpawnEntity &pack) {
 	Entity &entity = world.ForceAddEntity(entity_id);
 	UpdateEntity(entity_id, pack.Seq());
 	pack.ReadEntity(entity);
-	uint32_t skel_id;
-	pack.ReadSkeletonID(skel_id);
-	Model *skel = skeletons.ByID(skel_id);
-	if (skel) {
-		skel->Instantiate(entity.GetModel());
-		entity.GetModel().SetTextures(tex_map);
+	uint32_t model_id;
+	pack.ReadModelID(model_id);
+	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) {
@@ -183,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;
 		}
 	}
@@ -194,7 +229,10 @@ void InteractiveState::Handle(const Packet::EntityUpdate &pack) {
 	auto world_end = world.Entities().end();
 
 	uint32_t count = 0;
+	glm::ivec3 base;
 	pack.ReadEntityCount(count);
+	pack.ReadChunkBase(base);
+	EntityState state;
 
 	for (uint32_t i = 0; i < count; ++i) {
 		uint32_t entity_id = 0;
@@ -209,7 +247,8 @@ void InteractiveState::Handle(const Packet::EntityUpdate &pack) {
 		}
 		if (world_iter->ID() == entity_id) {
 			if (UpdateEntity(entity_id, pack.Seq())) {
-				pack.ReadEntityState(world_iter->GetState(), i);
+				pack.ReadEntityState(state, base, i);
+				world_iter->SetState(state);
 			}
 		}
 	}
@@ -261,12 +300,18 @@ void InteractiveState::Handle(const Packet::BlockUpdate &pack) {
 		Block block;
 		pack.ReadIndex(index, i);
 		pack.ReadBlock(block, i);
-		if (index < Chunk::size && block.type < block_types.size()) {
+		if (index < Chunk::size && block.type < res.block_types.size()) {
 			manip.SetBlock(*chunk, index, block);
 		}
 	}
 }
 
+void InteractiveState::Handle(const Packet::Message &pack) {
+	string msg;
+	pack.ReadMessage(msg);
+	hud.PostMessage(msg);
+}
+
 void InteractiveState::SetAudio(bool b) {
 	master.GetConfig().audio.enabled = b;
 	if (b) {
@@ -303,11 +348,25 @@ 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();
 }
 
+void InteractiveState::OnLineSubmit(const string &line) {
+	if (!line.empty()) {
+		master.GetClient().SendMessage(1, 0, line);
+	}
+}
+
 
 MasterState::MasterState(
 	Environment &env,
@@ -383,7 +442,9 @@ void MasterState::On(const Packet::Join &pack) {
 	pack.ReadPlayerID(player_id);
 	state.reset(new InteractiveState(*this, player_id));
 
-	pack.ReadPlayerState(state->GetPlayer().GetEntity().GetState());
+	EntityState player_state;
+	pack.ReadPlayerState(player_state);
+	state->GetPlayer().GetEntity().SetState(player_state);
 
 	env.state.PopAfter(this);
 	env.state.Push(state.get());
@@ -458,5 +519,15 @@ void MasterState::On(const Packet::BlockUpdate &pack) {
 	state->Handle(pack);
 }
 
+void MasterState::On(const Packet::Message &pack) {
+	if (state) {
+		state->Handle(pack);
+	} else {
+		string msg;
+		pack.ReadMessage(msg);
+		cout << "got message before interface was created: " << msg << endl;
+	}
+}
+
 }
 }