X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ffont.h;h=278a14aa82ab53fd3cd2c57172f3dbbb3d33fe7a;hp=609f272316433866580b1797941fe95b69e05865;hb=48420e9e3f950cfe1e3ced8f8ea92d89671ae8c4;hpb=1431f24f29bd6862d547b831c40b2686ff56d1ef

diff --git a/source/font.h b/source/font.h
index 609f2723..278a14aa 100644
--- a/source/font.h
+++ b/source/font.h
@@ -3,7 +3,8 @@
 
 #include <map>
 #include <string>
-#include <msp/parser/loader.h>
+#include <msp/datafile/loader.h>
+#include <msp/strings/codec.h>
 #include "vertexarray.h"
 
 namespace Msp {
@@ -14,7 +15,7 @@ class Texture2D;
 class Font
 {
 public:
-	class Loader: public Msp::Parser::Loader
+	class Loader: public Msp::DataFile::Loader
 	{
 	public:
 		Loader(Font &);
@@ -28,22 +29,37 @@ public:
 	};
 
 	Font();
+	~Font();
+
 	void  set_texture(const Texture2D &);
-	void  add_glyph(wchar_t, 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 &) const;
-	float get_string_width(const std::wstring &) const;
-	void  draw_glyph(wchar_t);
+	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::wstring &) const;
+	void  draw_string(const std::string &, Codecs::Decoder &) const;
 	void  draw_multiline(const std::string &) const;
-	~Font();
+	
+	template<class C>
+	float get_string_width(const std::string &str) const
+	{
+		typename C::Decoder dec;
+		return get_string_width(str, dec);
+	}	
+	
+	template<class C>
+	void draw_string(const std::string &str) const
+	{
+		typename C::Decoder dec;
+		draw_string(str, dec);
+	}	
 private:
 	struct Glyph
 	{
-		class Loader: public Msp::Parser::Loader
+		class Loader: public Msp::DataFile::Loader
 		{
 		public:
 			Loader(Glyph &);
@@ -56,7 +72,7 @@ private:
 			void offset(float, float);
 		};
 
-		wchar_t code;
+		unsigned code;
 		float x1,y1;
 		float x2,y2;
 		float w,h;
@@ -64,7 +80,7 @@ private:
 		float advance;
 		unsigned index;
 	};
-	typedef std::map<wchar_t, Glyph> GlyphMap;
+	typedef std::map<unsigned, Glyph> GlyphMap;
 
 	const Texture2D *tex;
 	bool     own_tex;
@@ -77,8 +93,8 @@ private:
 	void create_glyph_vertices();
 	void create_glyph_vertices(const Glyph &, VertexArrayBuilder &);
 	void prepare_render() const;
-	void draw_glyph(wchar_t) const;
-	float get_glyph_advance(wchar_t) const;
+	void draw_glyph(unsigned) const;
+	float get_glyph_advance(unsigned) const;
 };
 
 } // namespace GL