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

diff --git a/source/font.h b/source/font.h
deleted file mode 100644
index 3178a4c2..00000000
--- a/source/font.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* $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/datafile/collection.h>
-#include <msp/strings/codec.h>
-#include "vertexarray.h"
-
-namespace Msp {
-namespace GL {
-
-class Texture2D;
-
-class Font
-{
-public:
-	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:
-		void init();
-		void texture(const std::string &);
-		void glyph(unsigned);
-	};
-
-	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;
-
-	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::DataFile::Loader
-		{
-		public:
-			Loader(Glyph &);
-			Glyph &get_object() { return glyph; }
-		private:
-			Glyph &glyph;
-
-			void texcoords(float, float, float, float);
-		};
-
-		unsigned code;
-		float x1,y1;
-		float x2,y2;
-		float w,h;
-		float off_x, off_y;
-		float advance;
-		unsigned index;
-	};
-	typedef std::map<unsigned, Glyph> GlyphMap;
-
-	const Texture2D *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(unsigned) const;
-	float get_glyph_advance(unsigned) const;
-};
-
-} // namespace GL
-} // namespace Msp
-
-#endif