X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=inline;f=source%2Ffont.h;h=68c035a64d0c4b2d34c6b207b67641d8dadb6e4f;hb=c3b6098d0ca039fed7dc714a64c369e6f6d07e5a;hp=a55933519b6c792a72bf967a7bdce2d7514afdf1;hpb=f098a871fc6dc7b61a5aca5581fa327e4124c036;p=libs%2Fgl.git

diff --git a/source/font.h b/source/font.h
index a5593351..68c035a6 100644
--- a/source/font.h
+++ b/source/font.h
@@ -10,8 +10,8 @@ Distributed under the LGPL
 
 #include <map>
 #include <string>
-#include <msp/datafile/loader.h>
-#include <msp/strings/codec.h>
+#include <msp/datafile/collection.h>
+#include <msp/strings/utf8.h>
 #include "vertexarray.h"
 
 namespace Msp {
@@ -22,31 +22,35 @@ 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);
 	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 &) const;
 	float get_string_width(const std::string &, Codecs::Decoder &) const;
 	void  draw_glyph(unsigned);
-	void  draw_string(const std::string &) const;
 	void  draw_string(const std::string &, Codecs::Decoder &) const;
 	void  draw_multiline(const std::string &) const;
 
@@ -57,12 +61,19 @@ public:
 		return get_string_width(str, dec);
 	}
 
+	float get_string_width(const std::string &str) const
+	{ return get_string_width<Codecs::Utf8>(str); }
+
 	template<class C>
 	void draw_string(const std::string &str) const
 	{
 		typename C::Decoder dec;
 		draw_string(str, dec);
 	}
+
+	void draw_string(const std::string &str) const
+	{ draw_string<Codecs::Utf8>(str); }
+
 private:
 	struct Glyph
 	{
@@ -88,7 +99,6 @@ private:
 	typedef std::map<unsigned, Glyph> GlyphMap;
 
 	const Texture2D *tex;
-	bool     own_tex;
 	float    default_size;
 	float    ascent;
 	float    descent;