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

diff --git a/source/font.h b/source/font.h
index b48c6445..dd40ec0b 100644
--- a/source/font.h
+++ b/source/font.h
@@ -10,7 +10,7 @@ Distributed under the LGPL
 
 #include <map>
 #include <string>
-#include <msp/datafile/collection.h>
+#include <msp/datafile/objectloader.h>
 #include <msp/strings/utf8.h>
 #include "vertexarray.h"
 
@@ -23,26 +23,19 @@ class Texture2D;
 class Font
 {
 public:
-	class Loader: public DataFile::Loader
+	class Loader: public DataFile::CollectionObjectLoader<Font>
 	{
-	private:
-		Font &font;
-		DataFile::Collection *coll;
-
 	public:
-		typedef DataFile::Collection Collection;
-
 		Loader(Font &);
-		Loader(Font &, DataFile::Collection &);
-		Font &get_object() { return font; }
-		DataFile::Collection &get_collection();
+		Loader(Font &, Collection &);
 	private:
 		void init();
-		void texture(const std::string &);
 		void glyph(unsigned);
+		void texture_inline();
 	};
 
 	Font();
+	~Font();
 
 	void  set_texture(const Texture2D &);
 	const Texture2D &get_texture() const;
@@ -88,14 +81,11 @@ public:
 private:
 	struct Glyph
 	{
-		class Loader: public Msp::DataFile::Loader
+		class Loader: public Msp::DataFile::ObjectLoader<Glyph>
 		{
 		public:
 			Loader(Glyph &);
-			Glyph &get_object() { return glyph; }
 		private:
-			Glyph &glyph;
-
 			void texcoords(float, float, float, float);
 		};
 
@@ -109,6 +99,7 @@ private:
 	typedef std::map<unsigned, Glyph> GlyphMap;
 
 	const Texture2D *tex;
+	bool     own_tex;
 	float    default_size;
 	float    ascent;
 	float    descent;