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

diff --git a/source/font.h b/source/font.h
deleted file mode 100644
index ebaa8e7a..00000000
--- a/source/font.h
+++ /dev/null
@@ -1,83 +0,0 @@
-#ifndef FONT_H_
-#define FONT_H_
-
-#include <map>
-#include <string>
-#include <msp/parser/loader.h>
-#include "vertexarray.h"
-
-namespace Msp {
-namespace GL {
-
-class Texture2D;
-
-class Font
-{
-public:
-	class Loader: public Msp::Parser::Loader
-	{
-	public:
-		Loader(Font &);
-		~Loader();
-		Font &get_object() { return font; }
-	private:
-		Font &font;
-
-		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);
-	float get_default_size() const { return default_size; }
-	float get_string_width(const std::string &) const;
-	float get_string_width(const std::wstring &) const;
-	void  draw_glyph(wchar_t);
-	void  draw_string(const std::string &) const;
-	void  draw_string(const std::wstring &) const;
-	void  draw_multiline(const std::string &) const;
-	~Font();
-private:
-	struct Glyph
-	{
-		class Loader: public Msp::Parser::Loader
-		{
-		public:
-			Loader(Glyph &);
-			Glyph &get_object() { return glyph; }
-		private:
-			Glyph &glyph;
-
-			void texcoords(float, float, float, float);
-			void size(float, float);
-			void offset(float, float);
-		};
-
-		wchar_t code;
-		float x1,y1;
-		float x2,y2;
-		float w,h;
-		float off_x, off_y;
-		float advance;
-		unsigned index;
-	};
-	typedef std::map<wchar_t, Glyph> GlyphMap;
-
-	const Texture2D *tex;
-	bool     own_tex;
-	float    default_size;
-	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;
-};
-
-} // namespace GL
-} // namespace Msp
-
-#endif