X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Ffont.cpp;h=766f011a97dc55708b3fb11da395342facfb6a92;hb=e92458a4a0e6191bff549a8b316dbbbd7c56e90f;hp=7d9b306b87486f5590e6acd3f1d75600c707902b;hpb=0bea04fdbb08596dcf57210164d5dbb10308b4d7;p=libs%2Fgl.git

diff --git a/source/font.cpp b/source/font.cpp
index 7d9b306b..766f011a 100644
--- a/source/font.cpp
+++ b/source/font.cpp
@@ -7,6 +7,7 @@ Distributed under the LGPL
 
 #include "gl.h"
 #include "font.h"
+#include "immediate.h"
 #include "primitivetype.h"
 #include "texture2d.h"
 
@@ -27,6 +28,13 @@ void Font::set_texture(const Texture2D &t)
 	tex=&t;
 }
 
+const Texture2D &Font::get_texture() const
+{
+	if(!tex)
+		throw InvalidState("No texture");
+	return *tex;
+}
+
 void Font::add_glyph(unsigned code, float x1, float y1, float x2, float y2, float w, float h, float ox, float oy, float adv)
 {
 	Glyph glyph;
@@ -55,26 +63,32 @@ float Font::get_string_width(const string &str, Codecs::Decoder &dec) const
 
 void Font::draw_string(const string &str, Codecs::Decoder &dec) const
 {
+	Immediate imm((TEXCOORD2, VERTEX2));
+	draw_string(str, dec, imm);
+}
+
+void Font::draw_string(const string &str, Codecs::Decoder &dec, PrimitiveBuilder &pbuilder) const
+{
+	if(!tex)
+		throw InvalidState("No texture");
+
 	tex->bind();
 
-	VertexArray va((TEXCOORD2, VERTEX2));
-	va.reserve(str.size()*4);
-	RefPtr<VertexArrayBuilder> vab=va.modify();
 	float x=0;
 	unsigned count=0;
+
+	pbuilder.begin(QUADS);
 	for(string::const_iterator i=str.begin(); i!=str.end();)
 	{
 		GlyphMap::const_iterator j=glyphs.find(dec.decode_char(str, i));
 		if(j==glyphs.end())
 			continue;
 
-		create_glyph_vertices(j->second, *vab, x);
+		create_glyph_vertices(j->second, pbuilder, x);
 		x+=j->second.advance;
 		count+=4;
 	}
-	vab=0;
-	va.apply();
-	glDrawArrays(QUADS, 0, count);
+	pbuilder.end();
 }
 
 void Font::create_glyph_vertices(const Glyph &glyph, VertexBuilder &vbuilder, float x) const