X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2Fapp.cpp;h=4d2d2c098afa17bcde96083ddf384aeddacaa86b;hb=2e3774eb3f2d5d23a08731175b168566457e2192;hp=3257f8b890867d4ae1e001cbd7816a58f1cab0d6;hpb=ede25c0a2f59e21521d1cd962e6ea9d78169ca12;p=blank.git diff --git a/src/app/app.cpp b/src/app/app.cpp index 3257f8b..4d2d2c0 100644 --- a/src/app/app.cpp +++ b/src/app/app.cpp @@ -4,10 +4,12 @@ #include "FrameCounter.hpp" #include "State.hpp" #include "StateControl.hpp" +#include "TextureIndex.hpp" #include "init.hpp" #include "../audio/Sound.hpp" #include "../graphics/ArrayTexture.hpp" +#include "../graphics/CubeMap.hpp" #include "../graphics/Font.hpp" #include "../graphics/Texture.hpp" #include "../io/TokenStreamReader.hpp" @@ -17,6 +19,7 @@ #include "../world/Entity.hpp" #include +#include #include #include #include @@ -27,18 +30,29 @@ using std::string; namespace blank { -Application::Application(Environment &e) +HeadlessApplication::HeadlessApplication(HeadlessEnvironment &e) : env(e) , states() { } +HeadlessApplication::~HeadlessApplication() { + +} + + +Application::Application(Environment &e) +: HeadlessApplication(e) +, env(e) { + +} + Application::~Application() { env.audio.StopAll(); } -void Application::RunN(size_t n) { +void HeadlessApplication::RunN(size_t n) { Uint32 last = SDL_GetTicks(); for (size_t i = 0; HasState() && i < n; ++i) { Uint32 now = SDL_GetTicks(); @@ -48,7 +62,7 @@ void Application::RunN(size_t n) { } } -void Application::RunT(size_t t) { +void HeadlessApplication::RunT(size_t t) { Uint32 last = SDL_GetTicks(); Uint32 finish = last + t; while (HasState() && last < finish) { @@ -59,16 +73,21 @@ void Application::RunT(size_t t) { } } -void Application::RunS(size_t n, size_t t) { +void HeadlessApplication::RunS(size_t n, size_t t) { for (size_t i = 0; HasState() && i < n; ++i) { Loop(t); + std::cout << '.'; + if (i % 16 == 15) { + std::cout << std::setfill(' ') << std::setw(5) << std::right << (i + 1) << std::endl; + } else { + std::cout << std::flush; + } } } -void Application::Run() { +void HeadlessApplication::Run() { Uint32 last = SDL_GetTicks(); - env.window.GrabMouse(); while (HasState()) { Uint32 now = SDL_GetTicks(); int delta = now - last; @@ -77,24 +96,47 @@ void Application::Run() { } } +void HeadlessApplication::Loop(int dt) { + env.counter.EnterFrame(); + Update(dt); + CommitStates(); + if (!HasState()) return; + env.counter.ExitFrame(); +} + void Application::Loop(int dt) { env.counter.EnterFrame(); HandleEvents(); if (!HasState()) return; Update(dt); - env.state.Commit(*this); + CommitStates(); if (!HasState()) return; Render(); env.counter.ExitFrame(); } +void HeadlessApplication::HandleEvents() { + env.counter.EnterHandle(); + SDL_Event event; + while (HasState() && SDL_PollEvent(&event)) { + Handle(event); + CommitStates(); + } + env.counter.ExitHandle(); +} + +void HeadlessApplication::Handle(const SDL_Event &event) { + GetState().Handle(event); +} + + void Application::HandleEvents() { env.counter.EnterHandle(); SDL_Event event; while (HasState() && SDL_PollEvent(&event)) { Handle(event); - env.state.Commit(*this); + CommitStates(); } env.counter.ExitHandle(); } @@ -126,8 +168,17 @@ void Application::Handle(const SDL_WindowEvent &event) { } } +void HeadlessApplication::Update(int dt) { + env.counter.EnterUpdate(); + if (HasState()) { + GetState().Update(dt); + } + env.counter.ExitUpdate(); +} + void Application::Update(int dt) { env.counter.EnterUpdate(); + env.audio.Update(dt); if (HasState()) { GetState().Update(dt); } @@ -149,7 +200,7 @@ void Application::Render() { } -void Application::PushState(State *s) { +void HeadlessApplication::PushState(State *s) { if (!states.empty()) { states.top()->OnPause(); } @@ -161,7 +212,7 @@ void Application::PushState(State *s) { s->OnResume(); } -State *Application::PopState() { +State *HeadlessApplication::PopState() { State *s = states.top(); states.pop(); s->OnPause(); @@ -172,7 +223,7 @@ State *Application::PopState() { return s; } -State *Application::SwitchState(State *s_new) { +State *HeadlessApplication::SwitchState(State *s_new) { State *s_old = states.top(); states.top() = s_new; --s_old->ref_count; @@ -188,16 +239,20 @@ State *Application::SwitchState(State *s_new) { return s_old; } -State &Application::GetState() { +State &HeadlessApplication::GetState() { return *states.top(); } -bool Application::HasState() const noexcept { +void HeadlessApplication::CommitStates() { + env.state.Commit(*this); +} + +bool HeadlessApplication::HasState() const noexcept { return !states.empty(); } -void StateControl::Commit(Application &app) { +void StateControl::Commit(HeadlessApplication &app) { while (!cue.empty()) { Memo m(cue.front()); cue.pop(); @@ -216,18 +271,33 @@ void StateControl::Commit(Application &app) { app.PopState(); } break; + case POP_AFTER: + while (app.HasState() && &app.GetState() != m.state) { + app.PopState(); + } + break; + case POP_UNTIL: + while (app.HasState()) { + if (app.PopState() == m.state) { + break; + } + } } } } -Assets::Assets(const string &base) +AssetLoader::AssetLoader(const string &base) : fonts(base + "fonts/") , sounds(base + "sounds/") , textures(base + "textures/") -, data(base + "data/") -, large_ui_font(LoadFont("DejaVuSans", 24)) -, small_ui_font(LoadFont("DejaVuSans", 16)) { +, data(base + "data/") { + +} + +Assets::Assets(const AssetLoader &loader) +: large_ui_font(loader.LoadFont("DejaVuSans", 24)) +, small_ui_font(loader.LoadFont("DejaVuSans", 16)) { } @@ -239,7 +309,7 @@ CuboidShape slab_shape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.0f, 0.5f }}); } -void Assets::LoadBlockTypes(const std::string &set_name, BlockTypeRegistry ®) const { +void AssetLoader::LoadBlockTypes(const std::string &set_name, BlockTypeRegistry ®, TextureIndex &tex_index) const { string full = data + set_name + ".types"; std::ifstream file(full); if (!file) { @@ -263,21 +333,12 @@ void Assets::LoadBlockTypes(const std::string &set_name, BlockTypeRegistry ®) if (name == "visible") { type.visible = in.GetBool(); } else if (name == "texture") { - // TODO: load textures as requested in.ReadString(tex_name); - if (tex_name == "rock-1") { - type.texture = 1; - } else if (tex_name == "rock-2") { - type.texture = 2; - } else if (tex_name == "rock-3") { - type.texture = 3; - } else if (tex_name == "debug") { - type.texture = 0; - } else { - throw runtime_error("unknown texture: " + tex_name); - } + type.texture = tex_index.GetID(tex_name); } else if (name == "color") { in.ReadVec(type.color); + } else if (name == "outline") { + in.ReadVec(type.outline_color); } else if (name == "label") { in.ReadString(type.label); } else if (name == "luminosity") { @@ -314,17 +375,90 @@ void Assets::LoadBlockTypes(const std::string &set_name, BlockTypeRegistry ®) } } -Font Assets::LoadFont(const string &name, int size) const { +CubeMap AssetLoader::LoadCubeMap(const string &name) const { + string full = textures + name; + string right = full + "-right.png"; + string left = full + "-left.png"; + string top = full + "-top.png"; + string bottom = full + "-bottom.png"; + string back = full + "-back.png"; + string front = full + "-front.png"; + + CubeMap cm; + cm.Bind(); + SDL_Surface *srf; + + if (!(srf = IMG_Load(right.c_str()))) throw SDLError("IMG_Load"); + try { + cm.Data(CubeMap::RIGHT, *srf); + } catch (...) { + SDL_FreeSurface(srf); + throw; + } + SDL_FreeSurface(srf); + + if (!(srf = IMG_Load(left.c_str()))) throw SDLError("IMG_Load"); + try { + cm.Data(CubeMap::LEFT, *srf); + } catch (...) { + SDL_FreeSurface(srf); + throw; + } + SDL_FreeSurface(srf); + + if (!(srf = IMG_Load(top.c_str()))) throw SDLError("IMG_Load"); + try { + cm.Data(CubeMap::TOP, *srf); + } catch (...) { + SDL_FreeSurface(srf); + throw; + } + SDL_FreeSurface(srf); + + if (!(srf = IMG_Load(bottom.c_str()))) throw SDLError("IMG_Load"); + try { + cm.Data(CubeMap::BOTTOM, *srf); + } catch (...) { + SDL_FreeSurface(srf); + throw; + } + SDL_FreeSurface(srf); + + if (!(srf = IMG_Load(back.c_str()))) throw SDLError("IMG_Load"); + try { + cm.Data(CubeMap::BACK, *srf); + } catch (...) { + SDL_FreeSurface(srf); + throw; + } + SDL_FreeSurface(srf); + + if (!(srf = IMG_Load(front.c_str()))) throw SDLError("IMG_Load"); + try { + cm.Data(CubeMap::FRONT, *srf); + } catch (...) { + SDL_FreeSurface(srf); + throw; + } + SDL_FreeSurface(srf); + + cm.FilterNearest(); + cm.WrapEdge(); + + return cm; +} + +Font AssetLoader::LoadFont(const string &name, int size) const { string full = fonts + name + ".ttf"; return Font(full.c_str(), size); } -Sound Assets::LoadSound(const string &name) const { +Sound AssetLoader::LoadSound(const string &name) const { string full = sounds + name + ".wav"; return Sound(full.c_str()); } -Texture Assets::LoadTexture(const string &name) const { +Texture AssetLoader::LoadTexture(const string &name) const { string full = textures + name + ".png"; Texture tex; SDL_Surface *srf = IMG_Load(full.c_str()); @@ -337,7 +471,7 @@ Texture Assets::LoadTexture(const string &name) const { return tex; } -void Assets::LoadTexture(const string &name, ArrayTexture &tex, int layer) const { +void AssetLoader::LoadTexture(const string &name, ArrayTexture &tex, int layer) const { string full = textures + name + ".png"; SDL_Surface *srf = IMG_Load(full.c_str()); if (!srf) { @@ -353,6 +487,30 @@ void Assets::LoadTexture(const string &name, ArrayTexture &tex, int layer) const SDL_FreeSurface(srf); } +void AssetLoader::LoadTextures(const TextureIndex &index, ArrayTexture &tex) const { + // TODO: where the hell should that size come from? + tex.Reserve(16, 16, index.Size(), Format()); + for (const auto &entry : index.Entries()) { + LoadTexture(entry.first, tex, entry.second); + } +} + + +TextureIndex::TextureIndex() +: id_map() { + +} + +int TextureIndex::GetID(const string &name) { + auto entry = id_map.find(name); + if (entry == id_map.end()) { + auto result = id_map.emplace(name, Size()); + return result.first->second; + } else { + return entry->second; + } +} + void FrameCounter::EnterFrame() noexcept { last_enter = SDL_GetTicks();