X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffont.h;h=3178a4c2717ed2f64d6d4e2c72bb413b84056a60;hb=224c40efa231c85b61da772a6f58c067d7b579b3;hp=ebaa8e7a7f43f469b7ae1ae246db6d92ad860bde;hpb=84bc56b96c21c831104a22e0cbd0f3b72ab5d8c3;p=libs%2Fgl.git

diff --git a/source/font.h b/source/font.h
index ebaa8e7a..3178a4c2 100644
--- a/source/font.h
+++ b/source/font.h
@@ -1,9 +1,17 @@
-#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/parser/loader.h>
+#include <msp/datafile/collection.h>
+#include <msp/strings/codec.h>
 #include "vertexarray.h"
 
 namespace Msp {
@@ -14,34 +22,57 @@ class Texture2D;
 class Font
 {
 public:
-	class Loader: public Msp::Parser::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();
+
 	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 &);
@@ -50,11 +81,9 @@ private:
 			Glyph &glyph;
 
 			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;
@@ -62,19 +91,20 @@ private:
 		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 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