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

diff --git a/source/font.h b/source/font.h
index a4600fc2..278a14aa 100644
--- a/source/font.h
+++ b/source/font.h
@@ -3,7 +3,9 @@
 
 #include <map>
 #include <string>
-#include <msp/parser/loader.h>
+#include <msp/datafile/loader.h>
+#include <msp/strings/codec.h>
+#include "vertexarray.h"
 
 namespace Msp {
 namespace GL {
@@ -13,10 +15,12 @@ class Texture2D;
 class Font
 {
 public:
-	class Loader: public Msp::Parser::Loader
+	class Loader: public Msp::DataFile::Loader
 	{
 	public:
 		Loader(Font &);
+		~Loader();
+		Font &get_object() { return font; }
 	private:
 		Font &font;
 
@@ -25,17 +29,37 @@ public:
 	};
 
 	Font();
+	~Font();
+
 	void  set_texture(const Texture2D &);
-	void  add_glyph(wchar_t, 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;
-	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::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 &);
@@ -45,23 +69,32 @@ private:
 
 			void texcoords(float, float, float, float);
 			void size(float, float);
+			void offset(float, float);
 		};
 
-		wchar_t code;
+		unsigned code;
 		float x1,y1;
 		float x2,y2;
 		float w,h;
-		float descent;
+		float off_x, off_y;
 		float advance;
+		unsigned index;
 	};
-	typedef std::map<wchar_t, Glyph> GlyphMap;
+	typedef std::map<unsigned, Glyph> GlyphMap;
 
 	const Texture2D *tex;
 	bool     own_tex;
+	float    default_size;
+	float    ascent;
+	float    descent;
 	GlyphMap glyphs;
+	VertexArray varray;
 
-	void prepare(float *) const;
-	void draw_glyph(wchar_t, float *, float &) const;
+	void create_glyph_vertices();
+	void create_glyph_vertices(const Glyph &, VertexArrayBuilder &);
+	void prepare_render() const;
+	void draw_glyph(unsigned) const;
+	float get_glyph_advance(unsigned) const;
 };
 
 } // namespace GL