Reorder Font members

Remove unimplemented draw_glyph from header
Whitespace changes

diff --git a/source/font.cpp b/source/font.cpp
index bbbc40edb1062ceb1f69b0d8e1898ff40fff2a7e..ae2cb289c9980f1d193d3a794ac6f5f2a5d109c6 100644 (file)
--- a/source/font.cpp
+++ b/source/font.cpp
@@ -140,12 +140,12 @@ Font::Loader::Loader(Font &f, Collection &c):
 
 void Font::Loader::init()
 {
-       add("default_size", &Font::default_size);
-       add("ascent",  &Font::ascent);
-       add("descent", &Font::descent);
-       add("texture", &Font::tex);
+       add("default_size",   &Font::default_size);
+       add("ascent",         &Font::ascent);
+       add("descent",        &Font::descent);
+       add("texture",        &Font::tex);
        add("texture_inline", &Loader::texture_inline);
-       add("glyph",   &Loader::glyph);
+       add("glyph",          &Loader::glyph);
 }
 
 void Font::Loader::glyph(unsigned c)

diff --git a/source/font.h b/source/font.h
index dd40ec0b277f2deb9e835e26b5fda9c1f9ddab96..123373ea9df84f8b46ea296ce3542e60bbb48597 100644 (file)
--- a/source/font.h
+++ b/source/font.h
@@ -34,19 +34,46 @@ public:
                void texture_inline();
        };
 
+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;
+
+public:
        Font();
        ~Font();
 
-       void  set_texture(const Texture2D &);
+       void set_texture(const Texture2D &);
        const Texture2D &get_texture() const;
-       void  add_glyph(unsigned, 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 &, 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
@@ -58,6 +85,9 @@ public:
        float get_string_width(const std::string &str) const
        { return get_string_width<Codecs::Utf8>(str); }
 
+       void draw_string(const std::string &, Codecs::Decoder &) const;
+       void draw_string(const std::string &, Codecs::Decoder &, PrimitiveBuilder &) const;
+
        template<class C>
        void draw_string(const std::string &str) const
        {
@@ -79,32 +109,6 @@ public:
        { 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;
 };