Render text in N draw calls

Creates a single buffer per required texture and draws the whole buffer in one go. It does
introduce the use of deprecated GL_QUADS primitive, but it's the easiest way to go without
needing indices, repeated vertices etc

1 files changed, 7 insertions, 10 deletions

diff --git a/ui/text.h b/ui/text.h
index 5217050..31ed9a5 100644
--- a/ui/text.h
+++ b/ui/text.h
@@ -1,12 +1,12 @@
 #pragma once
 
 #include "font.h"
+#include "glContainer.h"
 #include "uiComponent.h"
 #include <glArrays.h>
 #include <glad/gl.h>
 #include <glm/glm.hpp>
 #include <string_view>
-#include <vector>
 
 class UIShader;
 union SDL_Event;
@@ -18,15 +18,12 @@ public:
 	void render(const UIShader &, const Position & parentPos) const override;
 	bool handleInput(const SDL_Event &, const Position & parentPos) override;
 
-private:
-	struct Model {
-		Model(GLuint, GLsizei);
-		GLuint texture;
-		GLsizei count;
-		glVertexArray vao;
-		glBuffer vbo;
-	};
+	Text & operator=(const std::string_view s);
 
-	std::vector<Model> models;
+private:
+	std::vector<std::pair<GLuint, std::pair<GLsizei, GLint>>> models;
+	glContainer<Font::Quad> quads;
+	glVertexArray vao;
 	glm::vec3 colour;
+	const Font & font;
 };