X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffont.cpp;h=8320374e5070ec5580dc5c6e74ddda3de5f1468c;hb=927a1aa0a3a27e463ec0efc08bd08e7c4e969909;hp=637569f205358a8a08edf846fbac8c55a480e7e1;hpb=a4ec5410595ddf37bfbc0e85ad87d31a9cbf94f1;p=libs%2Fgl.git

diff --git a/source/font.cpp b/source/font.cpp
index 637569f2..8320374e 100644
--- a/source/font.cpp
+++ b/source/font.cpp
@@ -5,8 +5,11 @@ Copyright © 2007  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include <msp/datafile/collection.h>
 #include "gl.h"
 #include "font.h"
+#include "immediate.h"
+#include "primitivetype.h"
 #include "texture2d.h"
 
 using namespace std;
@@ -16,15 +19,32 @@ namespace GL {
 
 Font::Font():
 	tex(0),
+	own_tex(false),
 	default_size(1),
 	ascent(1),
-	descent(0),
-	varray((TEXCOORD2, VERTEX2))
+	descent(0)
 { }
 
+Font::~Font()
+{
+	if(own_tex)
+		delete tex;
+}
+
 void Font::set_texture(const Texture2D &t)
 {
+	if(own_tex)
+		delete tex;
+
 	tex=&t;
+	own_tex=false;
+}
+
+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)
@@ -40,11 +60,7 @@ void Font::add_glyph(unsigned code, float x1, float y1, float x2, float y2, floa
 	glyph.off_x=ox;
 	glyph.off_y=oy;
 	glyph.advance=adv;
-	glyph.index=glyphs.size();
 	glyphs.insert(GlyphMap::value_type(code, glyph));
-
-	RefPtr<VertexArrayBuilder> va_builder=varray.modify();
-	create_glyph_vertices(glyph, *va_builder);
 }
 
 float Font::get_string_width(const string &str, Codecs::Decoder &dec) const
@@ -59,58 +75,44 @@ float Font::get_string_width(const string &str, Codecs::Decoder &dec) const
 
 void Font::draw_string(const string &str, Codecs::Decoder &dec) const
 {
-	prepare_render();
-
-	for(string::const_iterator i=str.begin(); i!=str.end();)
-		draw_glyph(dec.decode_char(str, i));
-
-	glPopMatrix();
+	Immediate imm((TEXCOORD2, VERTEX2));
+	draw_string(str, dec, imm);
 }
 
-void Font::create_glyph_vertices()
+void Font::draw_string(const string &str, Codecs::Decoder &dec, PrimitiveBuilder &pbuilder) const
 {
-	varray.clear();
-	RefPtr<VertexArrayBuilder> va_builder=varray.modify();
+	if(!tex)
+		throw InvalidState("No texture");
 
-	unsigned n=0;
-	for(GlyphMap::iterator i=glyphs.begin(); i!=glyphs.end(); ++i, ++n)
-	{
-		i->second.index=n;
-		create_glyph_vertices(i->second, *va_builder);
-	}
-}
-
-void Font::create_glyph_vertices(const Glyph &glyph, VertexArrayBuilder &va_builder)
-{
-	va_builder.texcoord(glyph.x1, glyph.y1);
-	va_builder.vertex(glyph.off_x, glyph.off_y);
-	va_builder.texcoord(glyph.x2, glyph.y1);
-	va_builder.vertex(glyph.off_x+glyph.w, glyph.off_y);
-	va_builder.texcoord(glyph.x2, glyph.y2);
-	va_builder.vertex(glyph.off_x+glyph.w, glyph.off_y+glyph.h);
-	va_builder.texcoord(glyph.x1, glyph.y2);
-	va_builder.vertex(glyph.off_x, glyph.off_y+glyph.h);
-}
-
-void Font::prepare_render() const
-{
 	tex->bind();
-	varray.apply();
-	glPushMatrix();
-}
 
-void Font::draw_glyph(unsigned code) const
-{
-	GlyphMap::const_iterator i=glyphs.find(code);
-	if(i==glyphs.end())
-		return;
+	float x=0;
+	unsigned count=0;
 
-	const Glyph &glyph=i->second;
-	(void)glyph;
+	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;
 
-	glDrawArrays(GL_QUADS, i->second.index*4, 4);
+		create_glyph_vertices(j->second, pbuilder, x);
+		x+=j->second.advance;
+		count+=4;
+	}
+	pbuilder.end();
+}
 
-	glTranslatef(i->second.advance, 0, 0);
+void Font::create_glyph_vertices(const Glyph &glyph, VertexBuilder &vbuilder, float x) const
+{
+	vbuilder.texcoord(glyph.x1, glyph.y1);
+	vbuilder.vertex(x+glyph.off_x, glyph.off_y);
+	vbuilder.texcoord(glyph.x2, glyph.y1);
+	vbuilder.vertex(x+glyph.off_x+glyph.w, glyph.off_y);
+	vbuilder.texcoord(glyph.x2, glyph.y2);
+	vbuilder.vertex(x+glyph.off_x+glyph.w, glyph.off_y+glyph.h);
+	vbuilder.texcoord(glyph.x1, glyph.y2);
+	vbuilder.vertex(x+glyph.off_x, glyph.off_y+glyph.h);
 }
 
 float Font::get_glyph_advance(unsigned code) const
@@ -124,37 +126,24 @@ float Font::get_glyph_advance(unsigned code) const
 
 
 Font::Loader::Loader(Font &f):
-	font(f),
-	coll(0)
+	DataFile::CollectionObjectLoader<Font>(f, 0)
 {
 	init();
 }
 
 Font::Loader::Loader(Font &f, Collection &c):
-	font(f),
-	coll(&c)
+	DataFile::CollectionObjectLoader<Font>(f, &c)
 {
 	init();
 }
 
-DataFile::Collection &Font::Loader::get_collection()
-{
-	if(!coll)
-		throw InvalidState("No collection");
-	return *coll;
-}
-
-Font::Loader::~Loader()
-{
-	font.create_glyph_vertices();
-}
-
 void Font::Loader::init()
 {
 	add("default_size", &Font::default_size);
 	add("ascent",  &Font::ascent);
 	add("descent", &Font::descent);
 	add("texture", &Font::tex);
+	add("texture_inline", &Loader::texture_inline);
 	add("glyph",   &Loader::glyph);
 }
 
@@ -163,12 +152,20 @@ void Font::Loader::glyph(unsigned c)
 	Glyph gl;
 	gl.code=c;
 	load_sub(gl);
-	font.glyphs.insert(GlyphMap::value_type(c, gl));
+	obj.glyphs.insert(GlyphMap::value_type(c, gl));
+}
+
+void Font::Loader::texture_inline()
+{
+	RefPtr<Texture2D> tex=new Texture2D;
+	load_sub(*tex);
+	obj.tex=tex.release();
+	obj.own_tex=true;
 }
 
 
 Font::Glyph::Loader::Loader(Glyph &g):
-	glyph(g)
+	DataFile::ObjectLoader<Glyph>(g)
 {
 	add("texcoords", &Loader::texcoords);
 	add("size",      &Glyph::w,     &Glyph::h);
@@ -178,10 +175,10 @@ Font::Glyph::Loader::Loader(Glyph &g):
 
 void Font::Glyph::Loader::texcoords(float x1, float y1, float x2, float y2)
 {
-	glyph.x1=x1;
-	glyph.y1=y1;
-	glyph.x2=x2;
-	glyph.y2=y2;
+	obj.x1=x1;
+	obj.y1=y1;
+	obj.x2=x2;
+	obj.y2=y2;
 }
 
 } // namespace GL