Browse Source

Engine: Comment out text-area test code

master
Riyyi 2 years ago
parent
commit
10a5b70520
  1. 4
      src/inferno/application.cpp
  2. 2
      src/inferno/application.h
  3. 6
      src/inferno/component/textareacomponent.h
  4. 2
      src/inferno/scene/scene.h

4
src/inferno/application.cpp

@ -48,7 +48,7 @@ Application::Application(s)
// Load assets // 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"); // auto bla = GlTFFile::read("assets/gltf/box.glb");
// ruc::success("@{}@", bla.first.get()); // ruc::success("@{}@", bla.first.get());
@ -84,6 +84,7 @@ int Application::run()
{ {
ruc::debug("Application startup"); ruc::debug("Application startup");
#if 0
std::array<CharacterVertex, Renderer::vertexPerQuad> character; std::array<CharacterVertex, Renderer::vertexPerQuad> character;
// character.at(0).quad.textureCoordinates = { 0.0f, 0.0f }; // bottom left // character.at(0).quad.textureCoordinates = { 0.0f, 0.0f }; // bottom left
@ -131,6 +132,7 @@ int Application::run()
// borderedge // borderedge
// bordercolor // bordercolor
// offset // offset
#endif
while (!m_window->shouldClose()) { while (!m_window->shouldClose()) {

2
src/inferno/application.h

@ -23,7 +23,7 @@ class WindowResizeEvent;
class Application : public ruc::Singleton<Application> { class Application : public ruc::Singleton<Application> {
public: public:
Application(s); explicit Application(s);
virtual ~Application(); virtual ~Application();
int run(); int run();

6
src/inferno/component/textareacomponent.h

@ -16,12 +16,13 @@
namespace Inferno { namespace Inferno {
struct TextAreaComponent { struct TextAreaComponent {
std::string content { "" }; std::string content;
std::string font { "" }; std::string font;
uint32_t fontSize { 0 }; uint32_t fontSize { 0 };
uint32_t width { 0 }; uint32_t width { 0 };
uint32_t lines { 0 }; uint32_t lines { 0 };
#if 0
TextAreaComponent() {} TextAreaComponent() {}
TextAreaComponent(const std::string& content, const std::string& font, TextAreaComponent(const std::string& content, const std::string& font,
uint32_t fontSize, uint32_t width, uint32_t lines) uint32_t fontSize, uint32_t width, uint32_t lines)
@ -32,6 +33,7 @@ struct TextAreaComponent {
, lines(lines) , lines(lines)
{ {
} }
#endif
// booleans? // booleans?
// glm::vec4 outlineColor { 1.0f, 1.0f, 1.0f, 1.0f }; // glm::vec4 outlineColor { 1.0f, 1.0f, 1.0f, 1.0f };

2
src/inferno/scene/scene.h

@ -55,7 +55,7 @@ public:
{ {
validEntity(entity); validEntity(entity);
return m_registry->emplace_or_replace<T>(entt::entity { entity }, std::forward<P>(parameters)...); return m_registry->emplace_or_replace<T>(entt::entity { entity }, std::forward<P>(parameters)...);
}; }
template<typename T> template<typename T>
size_t removeComponent(uint32_t entity) const size_t removeComponent(uint32_t entity) const

Loading…
Cancel
Save