use entity's eyes to aim

[blank.git] / src / standalone / MasterState.cpp

diff --git a/src/standalone/MasterState.cpp b/src/standalone/MasterState.cpp
index 30925a971db74b41ea39cc419bcfb1b5acac70f2..1035bb23688da035893c3a10fdd8e687a9190b79 100644 (file)
--- a/src/standalone/MasterState.cpp
+++ b/src/standalone/MasterState.cpp
@@ -1,8 +1,9 @@
 #include "MasterState.hpp"
 
+#include "../app/Config.hpp"
 #include "../app/Environment.hpp"
 #include "../app/init.hpp"
-#include "../app/TextureIndex.hpp"
+#include "../io/WorldSave.hpp"
 
 #include <SDL.h>
 
@@ -12,37 +13,69 @@ namespace standalone {
 
 MasterState::MasterState(
        Environment &env,
+       Config &config,
        const Generator::Config &gc,
-       const Interface::Config &ic,
        const World::Config &wc,
        const WorldSave &save
 )
-: env(env)
-, block_types()
-, world(block_types, wc)
-, interface(ic, env, world, world.AddPlayer(ic.player_name))
+: 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.audio, sounds, player.GetEntity())
+, input(world, player, manip)
+, interface(config, env.keymap, input, *this)
 , generator(gc)
 , chunk_loader(world.Chunks(), generator, save)
-, chunk_renderer(*interface.GetPlayer().chunks)
-, skeletons()
-, spawner(world, skeletons, gc.seed)
+, chunk_renderer(player.GetChunks())
+, 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);
-       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());
-       // TODO: better solution for initializing HUD
-       interface.SelectNext();
+       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();
 }
 
 
@@ -67,7 +100,7 @@ void MasterState::Handle(const SDL_Event &event) {
                        interface.Handle(event.wheel);
                        break;
                case SDL_QUIT:
-                       env.state.Switch(&unload);
+                       Exit();
                        break;
                default:
                        break;
@@ -75,30 +108,81 @@ void MasterState::Handle(const SDL_Event &event) {
 }
 
 void MasterState::Update(int dt) {
-       interface.Update(dt);
+       input.Update(dt);
+       if (input.BlockFocus()) {
+               hud.FocusBlock(input.BlockFocus().GetChunk(), input.BlockFocus().block);
+       } else if (input.EntityFocus()) {
+               hud.FocusEntity(*input.EntityFocus().entity);
+       } else {
+               hud.FocusNone();
+       }
+       hud.Display(res.block_types[player.GetInventorySlot() + 1]);
+       hud.Update(dt);
        spawner.Update(dt);
        world.Update(dt);
        chunk_loader.Update(dt);
        chunk_renderer.Update(dt);
 
-       Entity &player = *interface.GetPlayer().entity;
-
-       glm::mat4 trans = player.Transform(player.ChunkCoords());
+       glm::mat4 trans = player.GetEntity().Transform(player.GetEntity().ChunkCoords());
        glm::vec3 dir(trans * glm::vec4(0.0f, 0.0f, -1.0f, 0.0f));
        glm::vec3 up(trans * glm::vec4(0.0f, 1.0f, 0.0f, 0.0f));
-       env.audio.Position(player.Position());
-       env.audio.Velocity(player.Velocity());
+       env.audio.Position(player.GetEntity().Position());
+       env.audio.Velocity(player.GetEntity().Velocity());
        env.audio.Orientation(dir, up);
 }
 
 void MasterState::Render(Viewport &viewport) {
-       Entity &player = *interface.GetPlayer().entity;
-       viewport.WorldPosition(player.Transform(player.ChunkCoords()));
-       chunk_renderer.Render(viewport);
-       world.Render(viewport);
-       sky.Render(viewport);
+       viewport.WorldPosition(
+               player.GetEntity().Transform(player.GetEntity().ChunkCoords())
+               * player.GetEntity().GetModel().EyesTransform());
+       if (config.video.world) {
+               chunk_renderer.Render(viewport);
+               world.Render(viewport);
+               sky.Render(viewport);
+       }
+       hud.Render(viewport);
+}
+
+
+void MasterState::SetAudio(bool b) {
+       config.audio.enabled = b;
+       if (b) {
+               hud.PostMessage("Audio enabled");
+       } else {
+               hud.PostMessage("Audio disabled");
+       }
+}
+
+void MasterState::SetVideo(bool b) {
+       config.video.world = b;
+       if (b) {
+               hud.PostMessage("World rendering enabled");
+       } else {
+               hud.PostMessage("World rendering disabled");
+       }
+}
+
+void MasterState::SetHUD(bool b) {
+       config.video.hud = b;
+       if (b) {
+               hud.PostMessage("HUD rendering enabled");
+       } else {
+               hud.PostMessage("HUD rendering disabled");
+       }
+}
+
+void MasterState::SetDebug(bool b) {
+       config.video.debug = b;
+       if (b) {
+               hud.PostMessage("Debug rendering enabled");
+       } else {
+               hud.PostMessage("Debug rendering disabled");
+       }
+}
 
-       interface.Render(viewport);
+void MasterState::Exit() {
+       save.Write(player);
+       env.state.Switch(&unload);
 }
 
 }