X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2Fapp.cpp;h=6c89bdbeebeef3710b43b37881a0af1042e8ccf6;hb=04bca2c5e74df466312c69abadf38e1f84aa70a9;hp=7f5f02f0d5e1c557675c56dbdad3b7a1ac970189;hpb=7e782291e0ce39eb2d4e8c1df28f682c313e6f8d;p=blank.git diff --git a/src/app/app.cpp b/src/app/app.cpp index 7f5f02f..6c89bdb 100644 --- a/src/app/app.cpp +++ b/src/app/app.cpp @@ -4,7 +4,6 @@ #include "FrameCounter.hpp" #include "State.hpp" #include "StateControl.hpp" -#include "TextureIndex.hpp" #include "init.hpp" #include "../audio/Sound.hpp" @@ -18,6 +17,7 @@ #include "../model/ModelRegistry.hpp" #include "../model/Shape.hpp" #include "../model/ShapeRegistry.hpp" +#include "../shared/ResourceIndex.hpp" #include "../world/BlockType.hpp" #include "../world/BlockTypeRegistry.hpp" #include "../world/Entity.hpp" @@ -81,7 +81,7 @@ 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) { + if (i % 32 == 31) { std::cout << std::setfill(' ') << std::setw(5) << std::right << (i + 1) << std::endl; } else { std::cout << std::flush; @@ -161,13 +161,14 @@ void Application::Handle(const SDL_Event &event) { void Application::Handle(const SDL_WindowEvent &event) { switch (event.event) { case SDL_WINDOWEVENT_FOCUS_GAINED: - env.window.GrabMouse(); + GetState().OnFocus(); break; case SDL_WINDOWEVENT_FOCUS_LOST: - env.window.ReleaseMouse(); + GetState().OnBlur(); break; case SDL_WINDOWEVENT_RESIZED: env.viewport.Resize(event.data1, event.data2); + GetState().OnResize(env.viewport); break; default: break; @@ -307,18 +308,11 @@ Assets::Assets(const AssetLoader &loader) } -namespace { - -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 AssetLoader::LoadBlockTypes( const string &set_name, BlockTypeRegistry ®, - TextureIndex &tex_index, + ResourceIndex &snd_index, + ResourceIndex &tex_index, const ShapeRegistry &shapes ) const { string full = data + set_name + ".types"; @@ -327,94 +321,19 @@ void AssetLoader::LoadBlockTypes( throw std::runtime_error("failed to open block type file " + full); } TokenStreamReader in(file); - string type_name; - string name; - string tex_name; - string shape_name; + string proto; while (in.HasMore()) { - in.ReadIdentifier(type_name); - in.Skip(Token::EQUALS); BlockType type; - - // read block type - in.Skip(Token::ANGLE_BRACKET_OPEN); - while (in.Peek().type != Token::ANGLE_BRACKET_CLOSE) { - in.ReadIdentifier(name); - in.Skip(Token::EQUALS); - if (name == "visible") { - type.visible = in.GetBool(); - } else if (name == "texture") { - in.ReadString(tex_name); - 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") { - type.luminosity = in.GetInt(); - } else if (name == "block_light") { - type.block_light = in.GetBool(); - } else if (name == "collision") { - 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); - type.shape = &shapes.Get(shape_name); - } else { - std::cerr << "warning: unknown block type property " << name << std::endl; - while (in.Peek().type != Token::SEMICOLON) { - in.Next(); - } - } - in.Skip(Token::SEMICOLON); + in.ReadIdentifier(type.name); + in.Skip(Token::EQUALS); + if (in.Peek().type == Token::IDENTIFIER) { + // prototype + in.ReadIdentifier(proto); + type.Copy(reg.Get(proto)); } - in.Skip(Token::ANGLE_BRACKET_CLOSE); + type.Read(in, snd_index, tex_index, shapes); in.Skip(Token::SEMICOLON); - - reg.Add(type); + reg.Add(std::move(type)); } } @@ -499,7 +418,7 @@ Font AssetLoader::LoadFont(const string &name, int size) const { void AssetLoader::LoadModels( const string &set_name, ModelRegistry &models, - TextureIndex &tex_index, + ResourceIndex &tex_index, const ShapeRegistry &shapes ) const { string full = data + set_name + ".models"; @@ -520,6 +439,10 @@ void AssetLoader::LoadModels( in.Skip(Token::EQUALS); if (prop_name == "root") { model.RootPart().Read(in, tex_index, shapes); + } else if (prop_name == "body") { + model.SetBody(in.GetULong()); + } else if (prop_name == "eyes") { + model.SetEyes(in.GetULong()); } else { while (in.HasMore() && in.Peek().type != Token::SEMICOLON) { in.Next(); @@ -584,7 +507,7 @@ void AssetLoader::LoadTexture(const string &name, ArrayTexture &tex, int layer) SDL_FreeSurface(srf); } -void AssetLoader::LoadTextures(const TextureIndex &index, ArrayTexture &tex) const { +void AssetLoader::LoadTextures(const ResourceIndex &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()) { @@ -593,22 +516,6 @@ void AssetLoader::LoadTextures(const TextureIndex &index, ArrayTexture &tex) con } -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(); last_tick = last_enter;