X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fstandalone%2FMasterState.cpp;h=1035bb23688da035893c3a10fdd8e687a9190b79;hb=f430ad789fe620ad2e8b2b2b99af868372791295;hp=dedb4ce3c49206b90c0a8deb96592cecf9f869d9;hpb=825f479edf9867938b6789215ad7ae6303596cba;p=blank.git

diff --git a/src/standalone/MasterState.cpp b/src/standalone/MasterState.cpp
index dedb4ce..1035bb2 100644
--- a/src/standalone/MasterState.cpp
+++ b/src/standalone/MasterState.cpp
@@ -3,7 +3,6 @@
 #include "../app/Config.hpp"
 #include "../app/Environment.hpp"
 #include "../app/init.hpp"
-#include "../app/TextureIndex.hpp"
 #include "../io/WorldSave.hpp"
 
 #include <SDL.h>
@@ -21,35 +20,39 @@ MasterState::MasterState(
 )
 : config(config)
 , env(env)
-, block_types()
+, res()
+, sounds()
 , save(save)
-, world(block_types, wc)
+, 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, block_types)
+, generator(gc)
 , chunk_loader(world.Chunks(), generator, save)
 , chunk_renderer(player.GetChunks())
-, skeletons()
-, spawner(world, skeletons, env.rng)
+, spawner(world, res.models, env.rng)
 , sky(env.loader.LoadCubeMap("skybox"))
 , preload(env, chunk_loader, chunk_renderer)
 , unload(env, world.Chunks(), save) {
-	TextureIndex tex_index;
-	env.loader.LoadBlockTypes("default", block_types, tex_index);
-	interface.SetInventorySlots(block_types.Size() - 1);
-	generator.Scan();
-	chunk_renderer.LoadTextures(env.loader, tex_index);
+	res.Load(env.loader, "default");
+	if (res.models.size() < 2) {
+		throw std::runtime_error("need at least two models to run");
+	}
+	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);
-	skeletons.Load();
-	spawner.LimitSkeletons(0, skeletons.size());
 	if (save.Exists(player)) {
 		save.Read(player);
 	} else {
-		// TODO: spawn
+		spawn_player = true;
 	}
 }
 
@@ -58,9 +61,21 @@ MasterState::~MasterState() {
 }
 
 
-void MasterState::OnEnter() {
-	env.state.Push(&preload);
-	env.window.GrabMouse();
+void MasterState::OnResume() {
+	if (spawn_index.MissingChunks() > 0) {
+		env.state.Push(&preload);
+	}
+	if (config.input.mouse) {
+		env.window.GrabMouse();
+	}
+	if (spawn_player) {
+		// TODO: spawn
+		spawn_player = false;
+	}
+}
+
+void MasterState::OnPause() {
+	env.window.ReleaseMouse();
 }
 
 
@@ -101,7 +116,7 @@ void MasterState::Update(int dt) {
 	} else {
 		hud.FocusNone();
 	}
-	hud.Display(block_types[player.GetInventorySlot() + 1]);
+	hud.Display(res.block_types[player.GetInventorySlot() + 1]);
 	hud.Update(dt);
 	spawner.Update(dt);
 	world.Update(dt);
@@ -117,7 +132,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);