Text now handles color, alpha and icon parsing

2016-03-09 12:11:26 +01:00
parent e5dba6604b
commit 12dd1d21de
2 changed files with 93 additions and 6 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;