Make use of the ability to load multiple arguments diretly into member variables

diff --git a/source/font.cpp b/source/font.cpp
index 2cab462c04e9eaef76b27066d327cebb15a93396..3b02583b401043b8e042becbc1edeb6febe9668c 100644 (file)
--- a/source/font.cpp
+++ b/source/font.cpp
@@ -177,8 +177,8 @@ Font::Glyph::Loader::Loader(Glyph &g):
        glyph(g)
 {
        add("texcoords", &Loader::texcoords);
-       add("size",      &Loader::size);
-       add("offset",    &Loader::offset);
+       add("size",      &Glyph::w,     &Glyph::h);
+       add("offset",    &Glyph::off_x, &Glyph::off_y);
        add("advance",   &Glyph::advance);
 }
 
@@ -190,17 +190,5 @@ void Font::Glyph::Loader::texcoords(float x1, float y1, float x2, float y2)
        glyph.y2=y2;
 }
 
-void Font::Glyph::Loader::size(float w, float h)
-{
-       glyph.w=w;
-       glyph.h=h;
-}
-
-void Font::Glyph::Loader::offset(float x, float y)
-{
-       glyph.off_x=x;
-       glyph.off_y=y;
-}
-
 } // namespace GL
 } // namespace Msp

diff --git a/source/font.h b/source/font.h
index 278a14aa82ab53fd3cd2c57172f3dbbb3d33fe7a..7307122a5fb5a0ea07b3cdd903f6e591bbc89614 100644 (file)
--- a/source/font.h
+++ b/source/font.h
@@ -42,20 +42,20 @@ public:
        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
        {
@@ -68,8 +68,6 @@ private:
                        Glyph &glyph;
 
                        void texcoords(float, float, float, float);
-                       void size(float, float);
-                       void offset(float, float);
                };
 
                unsigned code;