X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=3c30a62495127a52ace02decb18233c845e463f5;hb=225a7e66ed3f3f03ab458ab39c914ed55cd69600;hp=773c0be595e06fd95f06aa410bf062c7d0d225f6;hpb=7c5e04a4af82947ae8e26db3d03f13a555c10aba;p=blank.git

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 773c0be..3c30a62 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -51,7 +51,7 @@ InteractiveState::InteractiveState(MasterState &master, uint32_t player_id)
 , sounds()
 , save(master.GetEnv().config.GetWorldPath(master.GetWorldConf().name, master.GetConfig().net.host))
 , world(res.block_types, master.GetWorldConf())
-, player(*world.AddPlayer(master.GetConfig().player.name))
+, player(*world.AddPlayer(master.GetConfig().player.name, player_id))
 , hud(master.GetEnv(), master.GetConfig(), player)
 , manip(master.GetEnv().audio, sounds, player.GetEntity())
 , input(world, player, master.GetClient())
@@ -59,6 +59,7 @@ InteractiveState::InteractiveState(MasterState &master, uint32_t player_id)
 , chunk_receiver(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) {
@@ -75,13 +76,30 @@ 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();
+	stat_timer.Start();
 	if (save.Exists(player)) {
 		save.Read(player);
 	}
 }
 
-void InteractiveState::OnEnter() {
-	master.GetEnv().window.GrabMouse();
+void InteractiveState::OnResume() {
+	OnFocus();
+}
+
+void InteractiveState::OnPause() {
+	OnBlur();
+}
+
+void InteractiveState::OnFocus() {
+	if (master.GetConfig().input.mouse) {
+		master.GetEnv().window.GrabMouse();
+	}
+	interface.Unlock();
+}
+
+void InteractiveState::OnBlur() {
+	master.GetEnv().window.ReleaseMouse();
+	interface.Lock();
 }
 
 void InteractiveState::Handle(const SDL_Event &event) {
@@ -89,6 +107,11 @@ void InteractiveState::Handle(const SDL_Event &event) {
 		case SDL_KEYDOWN:
 			// 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 {
@@ -119,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(res.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());
@@ -141,9 +155,21 @@ 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().entity);
+	} else {
+		hud.FocusNone();
+	}
 	if (world_dt > 0) {
 		input.PushPlayerUpdate(world_dt);
 	}
+	hud.Display(res.block_types[player.GetInventorySlot() + 1]);
+	if (stat_timer.Hit()) {
+		hud.UpdateNetStats(master);
+	}
+	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));
@@ -176,8 +202,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) {
@@ -187,7 +211,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;
 		}
 	}
@@ -201,6 +224,7 @@ void InteractiveState::Handle(const Packet::EntityUpdate &pack) {
 	glm::ivec3 base;
 	pack.ReadEntityCount(count);
 	pack.ReadChunkBase(base);
+	EntityState state;
 
 	for (uint32_t i = 0; i < count; ++i) {
 		uint32_t entity_id = 0;
@@ -215,7 +239,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(), base, i);
+				pack.ReadEntityState(state, base, i);
+				world_iter->SetState(state);
 			}
 		}
 	}
@@ -321,7 +346,9 @@ void InteractiveState::Exit() {
 }
 
 void InteractiveState::OnLineSubmit(const string &line) {
-	master.GetClient().SendMessage(1, 0, line);
+	if (!line.empty()) {
+		master.GetClient().SendMessage(1, 0, line);
+	}
 }
 
 
@@ -399,9 +426,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());
-	glm::vec3 orient(glm::eulerAngles(state->GetPlayer().GetEntity().Orientation()));
-	state->GetPlayerController().TurnHead(orient.x, orient.y);
+	EntityState player_state;
+	pack.ReadPlayerState(player_state);
+	state->GetPlayer().GetEntity().SetState(player_state);
 
 	env.state.PopAfter(this);
 	env.state.Push(state.get());