Merge pull request #185 from teamfisk/TextColor

Text that handles color, alpha and icon parsing
2016-03-11 15:25:06 +01:00
parent aa16a15693 981dc3467e
commit 2f61171d16
2 changed files with 174 additions and 74 deletions
@@ -23,6 +23,7 @@ public:

 private:
    void renderText(std::string text, Font* font, TextJob::AlignmentEnum alignment, glm::vec4 color, glm::mat4 modelMatrix, glm::mat4 projectionMatrix, glm::mat4 viewMatrix);
+	std::string parseColors(std::string text, std::map<int, glm::vec4>& colorChanges, glm::vec4 originalColor);

    Font* font;
    GLuint VAO, VBO;