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

diff --git a/src/standalone/MasterState.cpp b/src/standalone/MasterState.cpp
index 7ae6741..750e491 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)
@@ -41,13 +42,17 @@ MasterState::MasterState(
 	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;
 	}
@@ -129,7 +134,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);