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

diff --git a/source/font.h b/source/font.h
index b48c6445..123373ea 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,37 +23,57 @@ 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();
+	};
+
+private:
+	struct Glyph
+	{
+		class Loader: public Msp::DataFile::ObjectLoader<Glyph>
+		{
+		public:
+			Loader(Glyph &);
+		private:
+			void texcoords(float, float, float, float);
+		};
+
+		unsigned code;
+		float x1,y1;
+		float x2,y2;
+		float w,h;
+		float off_x, off_y;
+		float advance;
 	};
 
+	typedef std::map<unsigned, Glyph> GlyphMap;
+
+	const Texture2D *tex;
+	bool own_tex;
+	float default_size;
+	float ascent;
+	float descent;
+	GlyphMap glyphs;
+
+public:
 	Font();
+	~Font();
 
-	void  set_texture(const Texture2D &);
+	void set_texture(const Texture2D &);
 	const Texture2D &get_texture() const;
-	void  add_glyph(unsigned, float, float, float, float, float, float, float, float, float);
+	void add_glyph(unsigned, float, float, float, float, float, float, float, float, float);
 	float get_default_size() const { return default_size; }
 	float get_ascent() const { return ascent; }
 	float get_descent() const { return descent; }
+
 	float get_string_width(const std::string &, Codecs::Decoder &) const;
-	void  draw_glyph(unsigned);
-	void  draw_string(const std::string &, Codecs::Decoder &) const;
-	void  draw_string(const std::string &, Codecs::Decoder &, PrimitiveBuilder &) const;
 
 	template<class C>
 	float get_string_width(const std::string &str) const
@@ -65,6 +85,9 @@ public:
 	float get_string_width(const std::string &str) const
 	{ return get_string_width<Codecs::Utf8>(str); }
 
+	void draw_string(const std::string &, Codecs::Decoder &) const;
+	void draw_string(const std::string &, Codecs::Decoder &, PrimitiveBuilder &) const;
+
 	template<class C>
 	void draw_string(const std::string &str) const
 	{
@@ -86,34 +109,6 @@ public:
 	{ return draw_string<Codecs::Utf8>(str, pb); }
 
 private:
-	struct Glyph
-	{
-		class Loader: public Msp::DataFile::Loader
-		{
-		public:
-			Loader(Glyph &);
-			Glyph &get_object() { return glyph; }
-		private:
-			Glyph &glyph;
-
-			void texcoords(float, float, float, float);
-		};
-
-		unsigned code;
-		float x1,y1;
-		float x2,y2;
-		float w,h;
-		float off_x, off_y;
-		float advance;
-	};
-	typedef std::map<unsigned, Glyph> GlyphMap;
-
-	const Texture2D *tex;
-	float    default_size;
-	float    ascent;
-	float    descent;
-	GlyphMap glyphs;
-
 	void create_glyph_vertices(const Glyph &, VertexBuilder &, float) const;
 	float get_glyph_advance(unsigned) const;
 };