X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2Fapp.cpp;h=eb3dac1b8b4aa0eedcbd3456981a8554c408ebfa;hb=3a487f44c26f9bb9d1a1c831406b6497b2b3b425;hp=a6acade2c30f3f8eaf898160b922e84b0b810cac;hpb=045a6ec084bf1fb4df3c6ade4a88932cf61bed23;p=blank.git diff --git a/src/app/app.cpp b/src/app/app.cpp index a6acade..eb3dac1 100644 --- a/src/app/app.cpp +++ b/src/app/app.cpp @@ -9,15 +9,19 @@ #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" -#include "../model/shapes.hpp" +#include "../model/bounds.hpp" +#include "../model/Shape.hpp" +#include "../model/ShapeRegistry.hpp" #include "../world/BlockType.hpp" #include "../world/BlockTypeRegistry.hpp" #include "../world/Entity.hpp" #include +#include #include #include #include @@ -28,18 +32,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(); @@ -49,7 +64,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) { @@ -60,16 +75,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; @@ -78,24 +98,49 @@ void Application::Run() { } } +void HeadlessApplication::Loop(int dt) { + env.counter.EnterFrame(); + HandleEvents(); + if (!HasState()) return; + 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(); } @@ -127,6 +172,14 @@ 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); @@ -151,7 +204,7 @@ void Application::Render() { } -void Application::PushState(State *s) { +void HeadlessApplication::PushState(State *s) { if (!states.empty()) { states.top()->OnPause(); } @@ -163,7 +216,7 @@ void Application::PushState(State *s) { s->OnResume(); } -State *Application::PopState() { +State *HeadlessApplication::PopState() { State *s = states.top(); states.pop(); s->OnPause(); @@ -174,7 +227,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; @@ -190,16 +243,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(); @@ -218,30 +275,45 @@ 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)) { } namespace { -CuboidShape block_shape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f }}); -StairShape stair_shape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f }}, { 0.0f, 0.0f }); -CuboidShape slab_shape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.0f, 0.5f }}); +CuboidBounds block_shape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f }}); +StairBounds stair_shape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f }}, { 0.0f, 0.0f }); +CuboidBounds slab_shape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.0f, 0.5f }}); } -void Assets::LoadBlockTypes(const std::string &set_name, BlockTypeRegistry ®, TextureIndex &tex_index) const { +void AssetLoader::LoadBlockTypes(const string &set_name, BlockTypeRegistry ®, TextureIndex &tex_index) const { string full = data + set_name + ".types"; std::ifstream file(full); if (!file) { @@ -266,9 +338,23 @@ void Assets::LoadBlockTypes(const std::string &set_name, BlockTypeRegistry ®, type.visible = in.GetBool(); } else if (name == "texture") { in.ReadString(tex_name); - type.texture = tex_index.GetID(tex_name); - } else if (name == "color") { - in.ReadVec(type.color); + type.textures.push_back(tex_index.GetID(tex_name)); + } else if (name == "textures") { + in.Skip(Token::BRACKET_OPEN); + while (in.Peek().type != Token::BRACKET_CLOSE) { + in.ReadString(tex_name); + type.textures.push_back(tex_index.GetID(tex_name)); + if (in.Peek().type == Token::COMMA) { + in.Skip(Token::COMMA); + } + } + in.Skip(Token::BRACKET_CLOSE); + } else if (name == "rgb_mod") { + in.ReadVec(type.rgb_mod); + } else if (name == "hsl_mod") { + in.ReadVec(type.hsl_mod); + } else if (name == "outline") { + in.ReadVec(type.outline_color); } else if (name == "label") { in.ReadString(type.label); } else if (name == "luminosity") { @@ -279,6 +365,34 @@ void Assets::LoadBlockTypes(const std::string &set_name, BlockTypeRegistry ®, type.collision = in.GetBool(); } else if (name == "collide_block") { type.collide_block = in.GetBool(); + } else if (name == "generate") { + type.generate = in.GetBool(); + } else if (name == "min_solidity") { + type.min_solidity = in.GetFloat(); + } else if (name == "mid_solidity") { + type.mid_solidity = in.GetFloat(); + } else if (name == "max_solidity") { + type.max_solidity = in.GetFloat(); + } else if (name == "min_humidity") { + type.min_humidity = in.GetFloat(); + } else if (name == "mid_humidity") { + type.mid_humidity = in.GetFloat(); + } else if (name == "max_humidity") { + type.max_humidity = in.GetFloat(); + } else if (name == "min_temperature") { + type.min_temperature = in.GetFloat(); + } else if (name == "mid_temperature") { + type.mid_temperature = in.GetFloat(); + } else if (name == "max_temperature") { + type.max_temperature = in.GetFloat(); + } else if (name == "min_richness") { + type.min_richness = in.GetFloat(); + } else if (name == "mid_richness") { + type.mid_richness = in.GetFloat(); + } else if (name == "max_richness") { + type.max_richness = in.GetFloat(); + } else if (name == "commonness") { + type.commonness = in.GetFloat(); } else if (name == "shape") { in.ReadIdentifier(shape_name); if (shape_name == "block") { @@ -305,17 +419,107 @@ 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 { +void AssetLoader::LoadShapes(const string &set_name, ShapeRegistry &shapes) const { + string full = data + set_name + ".shapes"; + std::ifstream file(full); + if (!file) { + throw std::runtime_error("failed to open shape file " + full); + } + TokenStreamReader in(file); + string shape_name; + while (in.HasMore()) { + in.ReadIdentifier(shape_name); + in.Skip(Token::EQUALS); + Shape &shape = shapes.Add(shape_name); + shape.Read(in); + in.Skip(Token::SEMICOLON); + } +} + +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()); @@ -328,7 +532,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) { @@ -344,7 +548,7 @@ void Assets::LoadTexture(const string &name, ArrayTexture &tex, int layer) const SDL_FreeSurface(srf); } -void Assets::LoadTextures(const TextureIndex &index, ArrayTexture &tex) const { +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()) {