X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffont.h;h=3178a4c2717ed2f64d6d4e2c72bb413b84056a60;hb=80aac2618536baaa99b92629be6931363c49c4de;hp=7307122a5fb5a0ea07b3cdd903f6e591bbc89614;hpb=5f1c235da9bc956332efffebbc1bf7700621d269;p=libs%2Fgl.git

diff --git a/source/font.h b/source/font.h
index 7307122a..3178a4c2 100644
--- a/source/font.h
+++ b/source/font.h
@@ -1,9 +1,16 @@
-#ifndef FONT_H_
-#define FONT_H_
+/* $Id$
+
+This file is part of libmspgl
+Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
+#ifndef MSP_GL_FONT_H_
+#define MSP_GL_FONT_H_
 
 #include <map>
 #include <string>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/collection.h>
 #include <msp/strings/codec.h>
 #include "vertexarray.h"
 
@@ -15,21 +22,27 @@ class Texture2D;
 class Font
 {
 public:
-	class Loader: public Msp::DataFile::Loader
+	class Loader: public DataFile::Loader
 	{
+	private:
+		Font &font;
+		DataFile::Collection *coll;
+
 	public:
+		typedef DataFile::Collection Collection;
+
 		Loader(Font &);
+		Loader(Font &, DataFile::Collection &);
 		~Loader();
 		Font &get_object() { return font; }
+		DataFile::Collection &get_collection();
 	private:
-		Font &font;
-
+		void init();
 		void texture(const std::string &);
 		void glyph(unsigned);
 	};
 
 	Font();
-	~Font();
 
 	void  set_texture(const Texture2D &);
 	void  add_glyph(unsigned, float, float, float, float, float, float, float, float, float);
@@ -81,7 +94,6 @@ private:
 	typedef std::map<unsigned, Glyph> GlyphMap;
 
 	const Texture2D *tex;
-	bool     own_tex;
 	float    default_size;
 	float    ascent;
 	float    descent;