X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffont.cpp;h=44e3d241154b0e4acd8ccdd8e747091ea776f9ef;hb=b617c5d7b5283ad260a77f01e42e6170cabbc03d;hp=7d9b306b87486f5590e6acd3f1d75600c707902b;hpb=d1800d7ea80290f4913d0203241cef1409656522;p=libs%2Fgl.git

diff --git a/source/font.cpp b/source/font.cpp
index 7d9b306b..44e3d241 100644
--- a/source/font.cpp
+++ b/source/font.cpp
@@ -5,8 +5,10 @@ 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"
 
@@ -17,64 +19,88 @@ namespace GL {
 
 Font::Font():
 	tex(0),
+	own_tex(false),
 	default_size(1),
 	ascent(1),
 	descent(0)
 { }
 
+Font::~Font()
+{
+	if(own_tex)
+		delete tex;
+}
+
 void Font::set_texture(const Texture2D &t)
 {
-	tex=&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)
 {
 	Glyph glyph;
-	glyph.code=code;
-	glyph.x1=x1;
-	glyph.y1=y1;
-	glyph.x2=x2;
-	glyph.y2=y2;
-	glyph.w=w;
-	glyph.h=h;
-	glyph.off_x=ox;
-	glyph.off_y=oy;
-	glyph.advance=adv;
+	glyph.code = code;
+	glyph.x1 = x1;
+	glyph.y1 = y1;
+	glyph.x2 = x2;
+	glyph.y2 = y2;
+	glyph.w = w;
+	glyph.h = h;
+	glyph.off_x = ox;
+	glyph.off_y = oy;
+	glyph.advance = adv;
 	glyphs.insert(GlyphMap::value_type(code, glyph));
 }
 
 float Font::get_string_width(const string &str, Codecs::Decoder &dec) const
 {
-	float x=0;
+	float x = 0;
 
 	for(string::const_iterator i=str.begin(); i!=str.end();)
-		x+=get_glyph_advance(dec.decode_char(str, i));
+		x += get_glyph_advance(dec.decode_char(str, i));
 
 	return x;
 }
 
 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;
+	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));
+		GlyphMap::const_iterator j = glyphs.find(dec.decode_char(str, i));
 		if(j==glyphs.end())
 			continue;
 
-		create_glyph_vertices(j->second, *vab, x);
-		x+=j->second.advance;
-		count+=4;
+		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
@@ -91,7 +117,7 @@ void Font::create_glyph_vertices(const Glyph &glyph, VertexBuilder &vbuilder, fl
 
 float Font::get_glyph_advance(unsigned code) const
 {
-	GlyphMap::const_iterator i=glyphs.find(code);
+	GlyphMap::const_iterator i = glyphs.find(code);
 	if(i==glyphs.end())
 		return 0;
 
@@ -100,46 +126,46 @@ 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;
-}
-
 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);
 }
 
 void Font::Loader::glyph(unsigned c)
 {
 	Glyph gl;
-	gl.code=c;
+	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);
@@ -149,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