X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2Fapp.cpp;h=b111402e4809fca4bc8bb10db79b2f90da476213;hb=e245d91528b1447cd1649533c587aebe278c3a53;hp=1e82cab998b789e6a9be2fc62723defc2e012128;hpb=957b1df87d9a692c517a269221da81227100240e;p=blank.git diff --git a/src/app/app.cpp b/src/app/app.cpp index 1e82cab..b111402 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" @@ -13,7 +12,12 @@ #include "../graphics/Font.hpp" #include "../graphics/Texture.hpp" #include "../io/TokenStreamReader.hpp" -#include "../model/shapes.hpp" +#include "../model/bounds.hpp" +#include "../model/Model.hpp" +#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" @@ -24,8 +28,7 @@ #include #include -using std::runtime_error; -using std::string; +using namespace std; namespace blank { @@ -76,11 +79,11 @@ void HeadlessApplication::RunT(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; + cout << '.'; + if (i % 32 == 31) { + cout << setfill(' ') << setw(5) << right << (i + 1) << endl; } else { - std::cout << std::flush; + cout << flush; } } } @@ -157,13 +160,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; @@ -303,107 +307,32 @@ Assets::Assets(const AssetLoader &loader) } -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 }}); - -} - -void AssetLoader::LoadBlockTypes(const std::string &set_name, BlockTypeRegistry ®, TextureIndex &tex_index) const { +void AssetLoader::LoadBlockTypes( + const string &set_name, + BlockTypeRegistry ®, + ResourceIndex &snd_index, + ResourceIndex &tex_index, + const ShapeRegistry &shapes +) const { string full = data + set_name + ".types"; - std::ifstream file(full); + ifstream file(full); if (!file) { - throw std::runtime_error("failed to open block type file " + full); + throw 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.texture = tex_index.GetID(tex_name); - } 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); - if (shape_name == "block") { - type.shape = &block_shape; - type.fill = { true, true, true, true, true, true }; - } else if (shape_name == "slab") { - type.shape = &slab_shape; - type.fill = { false, true, false, false, false, false }; - } else if (shape_name == "stair") { - type.shape = &stair_shape; - type.fill = { false, true, false, false, false, true }; - } else { - throw runtime_error("unknown block shape: " + shape_name); - } - } else { - throw runtime_error("unknown block property: " + name); - } - 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(move(type)); } } @@ -485,6 +414,64 @@ Font AssetLoader::LoadFont(const string &name, int size) const { return Font(full.c_str(), size); } +void AssetLoader::LoadModels( + const string &set_name, + ModelRegistry &models, + ResourceIndex &tex_index, + const ShapeRegistry &shapes +) const { + string full = data + set_name + ".models"; + ifstream file(full); + if (!file) { + throw runtime_error("failed to open model file " + full); + } + TokenStreamReader in(file); + string model_name; + string prop_name; + while (in.HasMore()) { + in.ReadIdentifier(model_name); + in.Skip(Token::EQUALS); + in.Skip(Token::ANGLE_BRACKET_OPEN); + Model &model = models.Add(model_name); + while (in.HasMore() && in.Peek().type != Token::ANGLE_BRACKET_CLOSE) { + in.ReadIdentifier(prop_name); + 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(); + } + } + in.Skip(Token::SEMICOLON); + } + model.Enumerate(); + in.Skip(Token::ANGLE_BRACKET_CLOSE); + in.Skip(Token::SEMICOLON); + } +} + +void AssetLoader::LoadShapes(const string &set_name, ShapeRegistry &shapes) const { + string full = data + set_name + ".shapes"; + ifstream file(full); + if (!file) { + throw 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()); @@ -519,7 +506,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()) { @@ -528,22 +515,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; @@ -624,8 +595,28 @@ void FrameCounter::Push() noexcept { avg.waiting = sum.waiting * factor; avg.total = sum.total * factor; + //Print(cout); + sum = Frame(); max = Frame(); } +void FrameCounter::Print(ostream &out) const { + out << fixed << right << setprecision(2) << setfill(' ') + << "PEAK handle: " << setw(2) << peak.handle + << ".00ms, update: " << setw(2) << peak.update + << ".00ms, render: " << setw(2) << peak.render + << ".00ms, running: " << setw(2) << peak.running + << ".00ms, waiting: " << setw(2) << peak.waiting + << ".00ms, total: " << setw(2) << peak.total + << ".00ms" << endl + << " AVG handle: " << setw(5) << avg.handle + << "ms, update: " << setw(5) << avg.update + << "ms, render: " << setw(5) << avg.render + << "ms, running: " << setw(5) << avg.running + << "ms, waiting: " << setw(5) << avg.waiting + << "ms, total: " << setw(5) << avg.total + << "ms" << endl; +} + }