diff --git a/src/inferno/application.cpp b/src/inferno/application.cpp index 79e22b3..8a41a30 100644 --- a/src/inferno/application.cpp +++ b/src/inferno/application.cpp @@ -48,7 +48,7 @@ Application::Application(s) // Load assets - m_font = FontManager::the().load("assets/fnt/dejavu-sans"); + // m_font = FontManager::the().load("assets/fnt/dejavu-sans"); // auto bla = GlTFFile::read("assets/gltf/box.glb"); // ruc::success("@{}@", bla.first.get()); @@ -84,6 +84,7 @@ int Application::run() { ruc::debug("Application startup"); +#if 0 std::array character; // character.at(0).quad.textureCoordinates = { 0.0f, 0.0f }; // bottom left @@ -131,6 +132,7 @@ int Application::run() // borderedge // bordercolor // offset +#endif while (!m_window->shouldClose()) { diff --git a/src/inferno/application.h b/src/inferno/application.h index cce08cc..be58818 100644 --- a/src/inferno/application.h +++ b/src/inferno/application.h @@ -23,7 +23,7 @@ class WindowResizeEvent; class Application : public ruc::Singleton { public: - Application(s); + explicit Application(s); virtual ~Application(); int run(); diff --git a/src/inferno/component/textareacomponent.h b/src/inferno/component/textareacomponent.h index 91a49f3..9759e57 100644 --- a/src/inferno/component/textareacomponent.h +++ b/src/inferno/component/textareacomponent.h @@ -16,12 +16,13 @@ namespace Inferno { struct TextAreaComponent { - std::string content { "" }; - std::string font { "" }; + std::string content; + std::string font; uint32_t fontSize { 0 }; uint32_t width { 0 }; uint32_t lines { 0 }; +#if 0 TextAreaComponent() {} TextAreaComponent(const std::string& content, const std::string& font, uint32_t fontSize, uint32_t width, uint32_t lines) @@ -32,6 +33,7 @@ struct TextAreaComponent { , lines(lines) { } +#endif // booleans? // glm::vec4 outlineColor { 1.0f, 1.0f, 1.0f, 1.0f }; diff --git a/src/inferno/scene/scene.h b/src/inferno/scene/scene.h index 31885e4..e88897f 100644 --- a/src/inferno/scene/scene.h +++ b/src/inferno/scene/scene.h @@ -55,7 +55,7 @@ public: { validEntity(entity); return m_registry->emplace_or_replace(entt::entity { entity }, std::forward

(parameters)...); - }; + } template size_t removeComponent(uint32_t entity) const