X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fstandalone%2FMasterState.cpp;h=91ee4826682fbdaca890b76d3c1c8bb0c3ab4929;hb=ca90ec459ca0bd48c1483a45f30496aed61e9c21;hp=7ae67418a6160bec46081c23924eaf7e8bab357f;hpb=9c5308ba4108bd842af6d9d2e893ea575a7e6ca8;p=blank.git

diff --git a/src/standalone/MasterState.cpp b/src/standalone/MasterState.cpp
index 7ae6741..91ee482 100644
--- a/src/standalone/MasterState.cpp
+++ b/src/standalone/MasterState.cpp
@@ -21,13 +21,14 @@ MasterState::MasterState(
 : config(config)
 , env(env)
 , res()
+, sounds()
 , save(save)
 , world(res.block_types, wc)
 , spawn_index(world.Chunks().MakeIndex(wc.spawn, 3))
 , player(*world.AddPlayer(config.player.name))
 , spawn_player(false)
 , hud(env, config, player)
-, manip(env, player.GetEntity())
+, manip(env.audio, sounds, player.GetEntity())
 , input(world, player, manip)
 , interface(config, env.keymap, input, *this)
 , generator(gc)
@@ -36,18 +37,23 @@ MasterState::MasterState(
 , spawner(world, res.models, env.rng)
 , sky(env.loader.LoadCubeMap("skybox"))
 , 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");
 	}
-	spawner.LimitModels(0, res.models.size());
+	res.models[0].Instantiate(player.GetEntity().GetModel());
+	sounds.Load(env.loader, res.snd_index);
+	spawner.LimitModels(1, res.models.size());
 	interface.SetInventorySlots(res.block_types.size() - 1);
 	generator.LoadTypes(res.block_types);
 	chunk_renderer.LoadTextures(env.loader, res.tex_index);
 	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;
 	}
@@ -69,6 +75,7 @@ void MasterState::OnResume() {
 		// TODO: spawn
 		spawn_player = false;
 	}
+	hud.KeepMessages(false);
 }
 
 void MasterState::OnPause() {
@@ -79,7 +86,13 @@ void MasterState::OnPause() {
 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) {
+				env.state.Push(&chat);
+				hud.KeepMessages(true);
+			} else {
+				interface.HandlePress(event.key);
+			}
 			break;
 		case SDL_KEYUP:
 			interface.HandleRelease(event.key);
@@ -129,7 +142,9 @@ void MasterState::Update(int dt) {
 }
 
 void MasterState::Render(Viewport &viewport) {
-	viewport.WorldPosition(player.GetEntity().Transform(player.GetEntity().ChunkCoords()));
+	viewport.WorldPosition(
+		player.GetEntity().Transform(player.GetEntity().ChunkCoords())
+		* player.GetEntity().GetModel().EyesTransform());
 	if (config.video.world) {
 		chunk_renderer.Render(viewport);
 		world.Render(viewport);
@@ -180,5 +195,9 @@ void MasterState::Exit() {
 	env.state.Switch(&unload);
 }
 
+void MasterState::OnLineSubmit(const std::string &line) {
+	hud.PostMessage(line);
+}
+
 }
 }