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

diff --git a/source/font.cpp b/source/font.cpp
index 766f011a..8320374e 100644
--- a/source/font.cpp
+++ b/source/font.cpp
@@ -5,6 +5,7 @@ Copyright © 2007  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include <msp/datafile/collection.h>
 #include "gl.h"
 #include "font.h"
 #include "immediate.h"
@@ -18,14 +19,25 @@ 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)
 {
+	if(own_tex)
+		delete tex;
+
 	tex=&t;
+	own_tex=false;
 }
 
 const Texture2D &Font::get_texture() const
@@ -114,32 +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;
-}
-
 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);
 }
 
@@ -148,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);
@@ -163,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