Check the flat qualifier from the correct member

[libs/gl.git] / source / font.h

diff --git a/source/font.h b/source/font.h
deleted file mode 100644 (file)
index dd40ec0..0000000
--- a/source/font.h
+++ /dev/null
@@ -1,115 +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/objectloader.h>
-#include <msp/strings/utf8.h>
-#include "vertexarray.h"
-
-namespace Msp {
-namespace GL {
-
-class PrimitiveBuilder;
-class Texture2D;
-
-class Font
-{
-public:
-       class Loader: public DataFile::CollectionObjectLoader<Font>
-       {
-       public:
-               Loader(Font &);
-               Loader(Font &, Collection &);
-       private:
-               void init();
-               void glyph(unsigned);
-               void texture_inline();
-       };
-
-       Font();
-       ~Font();
-
-       void  set_texture(const Texture2D &);
-       const Texture2D &get_texture() const;
-       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 &, Codecs::Decoder &) const;
-       void  draw_glyph(unsigned);
-       void  draw_string(const std::string &, Codecs::Decoder &) const;
-       void  draw_string(const std::string &, Codecs::Decoder &, PrimitiveBuilder &) const;
-
-       template<class C>
-       float get_string_width(const std::string &str) const
-       {
-               typename C::Decoder dec;
-               return get_string_width(str, dec);
-       }
-
-       float get_string_width(const std::string &str) const
-       { return get_string_width<Codecs::Utf8>(str); }
-
-       template<class C>
-       void draw_string(const std::string &str) const
-       {
-               typename C::Decoder dec;
-               draw_string(str, dec);
-       }
-
-       void draw_string(const std::string &str) const
-       { draw_string<Codecs::Utf8>(str); }
-
-       template<class C>
-       void draw_string(const std::string &str, PrimitiveBuilder &pb) const
-       {
-               typename C::Decoder dec;
-               draw_string(str, dec, pb);
-       }
-
-       void draw_string(const std::string &str, PrimitiveBuilder &pb) const
-       { return draw_string<Codecs::Utf8>(str, pb); }
-
-private:
-       struct Glyph
-       {
-               class Loader: public Msp::DataFile::ObjectLoader<Glyph>
-               {
-               public:
-                       Loader(Glyph &);
-               private:
-                       void texcoords(float, float, float, float);
-               };
-
-               unsigned code;
-               float x1,y1;
-               float x2,y2;
-               float w,h;
-               float off_x, off_y;
-               float advance;
-       };
-       typedef std::map<unsigned, Glyph> GlyphMap;
-
-       const Texture2D *tex;
-       bool     own_tex;
-       float    default_size;
-       float    ascent;
-       float    descent;
-       GlyphMap glyphs;
-
-       void create_glyph_vertices(const Glyph &, VertexBuilder &, float) const;
-       float get_glyph_advance(unsigned) const;
-};
-
-} // namespace GL
-} // namespace Msp
-
-#endif