Merge branch 'Rendering' into TextRendering

# Conflicts: # include/Engine/Rendering/RenderQueue.h # include/Engine/Rendering/RenderQueueFactory.h # include/Engine/Rendering/Renderer.h # include/Engine/Rendering/ShaderProgram.h # include/Game/Game.h # resources/Schema/Components.xsd # resources/Schema/Entities/Test.xml # resources/Schema/Types/Entity.xsd # src/Engine/Rendering/RenderQueueFactory.cpp # src/Engine/Rendering/Renderer.cpp # src/Game/Game.cpp
2016-01-15 13:23:42 +01:00
parent 123c198e19 c99a8685bb
commit 6fbb962b5e
184 changed files with 9816 additions and 2121 deletions
@@ -8,16 +8,19 @@ Font::Font(std::string path)

    if (FT_Init_FreeType(&library)) {
        LOG_ERROR("FreeType error: init failed");
+        return;
    }

    if (FT_New_Face(library, path.c_str(), 0, &face)) {
        LOG_ERROR("FreeType error: loading font");
+        return;
    }

    FT_Set_Pixel_Sizes(face, 0, 48);

    if (FT_Load_Char(face, 'X', FT_LOAD_RENDER)) {
        LOG_ERROR("FreeType error: loading char");
+        return;
    }

    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);