X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fstandalone%2FMasterState.cpp;h=5ade4f1ed89a3f6009d19e54adb407c2d2c77a1e;hb=10a310869c61cc52046e165f36ac9639fe9d0c69;hp=1035bb23688da035893c3a10fdd8e687a9190b79;hpb=f430ad789fe620ad2e8b2b2b99af868372791295;p=blank.git

diff --git a/src/standalone/MasterState.cpp b/src/standalone/MasterState.cpp
index 1035bb2..5ade4f1 100644
--- a/src/standalone/MasterState.cpp
+++ b/src/standalone/MasterState.cpp
@@ -36,8 +36,10 @@ MasterState::MasterState(
 , chunk_renderer(player.GetChunks())
 , spawner(world, res.models, env.rng)
 , sky(env.loader.LoadCubeMap("skybox"))
+, cli(world)
 , preload(env, chunk_loader, chunk_renderer)
-, unload(env, world.Chunks(), save) {
+, unload(env, world.Chunks(), save)
+, chat(env, *this, *this) {
 	res.Load(env.loader, "default");
 	if (res.models.size() < 2) {
 		throw std::runtime_error("need at least two models to run");
@@ -51,6 +53,8 @@ MasterState::MasterState(
 	chunk_renderer.FogDensity(wc.fog_density);
 	if (save.Exists(player)) {
 		save.Read(player);
+		glm::vec3 orient(glm::eulerAngles(player.GetEntity().Orientation()));
+		input.TurnHead(orient.x, orient.y);
 	} else {
 		spawn_player = true;
 	}
@@ -64,25 +68,48 @@ MasterState::~MasterState() {
 void MasterState::OnResume() {
 	if (spawn_index.MissingChunks() > 0) {
 		env.state.Push(&preload);
-	}
-	if (config.input.mouse) {
-		env.window.GrabMouse();
+		return;
 	}
 	if (spawn_player) {
 		// TODO: spawn
 		spawn_player = false;
 	}
+	hud.KeepMessages(false);
+	OnFocus();
 }
 
 void MasterState::OnPause() {
+	OnBlur();
+}
+
+void MasterState::OnFocus() {
+	if (config.input.mouse) {
+		env.window.GrabMouse();
+	}
+	interface.Unlock();
+}
+
+void MasterState::OnBlur() {
 	env.window.ReleaseMouse();
+	interface.Lock();
 }
 
 
 void MasterState::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();
+				env.state.Push(&chat);
+				hud.KeepMessages(true);
+			} else if (event.key.keysym.sym == SDLK_SLASH) {
+				chat.Preset("/");
+				env.state.Push(&chat);
+				hud.KeepMessages(true);
+			} else {
+				interface.HandlePress(event.key);
+			}
 			break;
 		case SDL_KEYUP:
 			interface.HandleRelease(event.key);
@@ -108,7 +135,8 @@ void MasterState::Handle(const SDL_Event &event) {
 }
 
 void MasterState::Update(int dt) {
-	input.Update(dt);
+	spawner.Update(dt);
+	world.Update(dt);
 	if (input.BlockFocus()) {
 		hud.FocusBlock(input.BlockFocus().GetChunk(), input.BlockFocus().block);
 	} else if (input.EntityFocus()) {
@@ -118,8 +146,6 @@ void MasterState::Update(int dt) {
 	}
 	hud.Display(res.block_types[player.GetInventorySlot() + 1]);
 	hud.Update(dt);
-	spawner.Update(dt);
-	world.Update(dt);
 	chunk_loader.Update(dt);
 	chunk_renderer.Update(dt);
 
@@ -185,5 +211,16 @@ void MasterState::Exit() {
 	env.state.Switch(&unload);
 }
 
+void MasterState::OnLineSubmit(const std::string &line) {
+	if (line.empty()) {
+		return;
+	}
+	if (line[0] == '/' && line.size() > 1 && line[1] != '/') {
+		cli.Execute(player, line.substr(1));
+	} else {
+		hud.PostMessage(line);
+	}
+}
+
 }
 }