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

diff --git a/src/standalone/MasterState.cpp b/src/standalone/MasterState.cpp
index dedb4ce..9d95966 100644
--- a/src/standalone/MasterState.cpp
+++ b/src/standalone/MasterState.cpp
@@ -21,35 +21,41 @@ 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)
 , 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, 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();
+	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 {
-		// TODO: spawn
+		spawn_player = true;
 	}
 }
 
@@ -58,9 +64,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();
 }