X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fstandalone%2FMasterState.cpp;h=9d95966953590d7b5ab146f36cb4439b64f68505;hb=4e3afb4c7631591b80cb7740a9b6f46da69b7ae4;hp=272e5a39ac2afbf1caff668d89e991b847cdaf24;hpb=b066e776622f96e906600a0c4a08de392bd03676;p=blank.git

diff --git a/src/standalone/MasterState.cpp b/src/standalone/MasterState.cpp
index 272e5a3..9d95966 100644
--- a/src/standalone/MasterState.cpp
+++ b/src/standalone/MasterState.cpp
@@ -4,6 +4,7 @@
 #include "../app/Environment.hpp"
 #include "../app/init.hpp"
 #include "../app/TextureIndex.hpp"
+#include "../io/WorldSave.hpp"
 
 #include <SDL.h>
 
@@ -20,9 +21,14 @@ MasterState::MasterState(
 )
 : config(config)
 , env(env)
+, shapes()
 , block_types()
+, models()
+, save(save)
 , world(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())
 , input(world, player, manip)
@@ -30,23 +36,49 @@ MasterState::MasterState(
 , generator(gc)
 , chunk_loader(world.Chunks(), generator, save)
 , chunk_renderer(player.GetChunks())
-, skeletons()
-, spawner(world, skeletons, gc.seed)
+, spawner(world, 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);
+	env.loader.LoadShapes("default", shapes);
+	env.loader.LoadBlockTypes("default", block_types, tex_index, shapes);
+	env.loader.LoadModels("default", models, tex_index, shapes);
+	if (models.size() < 2) {
+		throw std::runtime_error("need at least two models to run");
+	}
+	spawner.LimitModels(0, models.size());
+	interface.SetInventorySlots(block_types.size() - 1);
+	generator.LoadTypes(block_types);
 	chunk_renderer.LoadTextures(env.loader, tex_index);
 	chunk_renderer.FogDensity(wc.fog_density);
-	skeletons.Load();
-	spawner.LimitSkeletons(0, skeletons.Size());
+	if (save.Exists(player)) {
+		save.Read(player);
+	} else {
+		spawn_player = true;
+	}
+}
+
+MasterState::~MasterState() {
+	world.Chunks().UnregisterIndex(spawn_index);
 }
 
 
-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();
 }
 
 
@@ -71,7 +103,7 @@ void MasterState::Handle(const SDL_Event &event) {
 			interface.Handle(event.wheel);
 			break;
 		case SDL_QUIT:
-			env.state.Switch(&unload);
+			Exit();
 			break;
 		default:
 			break;
@@ -84,6 +116,8 @@ void MasterState::Update(int dt) {
 		hud.FocusBlock(input.BlockFocus().GetChunk(), input.BlockFocus().block);
 	} else if (input.EntityFocus()) {
 		hud.FocusEntity(*input.EntityFocus().entity);
+	} else {
+		hud.FocusNone();
 	}
 	hud.Display(block_types[player.GetInventorySlot() + 1]);
 	hud.Update(dt);
@@ -148,7 +182,8 @@ void MasterState::SetDebug(bool b) {
 }
 
 void MasterState::Exit() {
-	env.state.Pop();
+	save.Write(player);
+	env.state.Switch(&unload);
 }
 
 }