X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffont.h;h=6f8f35ff1db4be61fc52af060e1daade7ae73496;hb=db735acce6c9409fabcab80d87930263032af47c;hp=21c202d795ef04a5fd4ec08957dddf44e0c9b0f3;hpb=a64e2e362cd7bce6f103f8878d69fcca4261bac9;p=libs%2Fgl.git diff --git a/source/font.h b/source/font.h index 21c202d7..6f8f35ff 100644 --- a/source/font.h +++ b/source/font.h @@ -29,7 +29,6 @@ public: void texture_ref(const std::string &); }; -private: struct Glyph { class Loader: public Msp::DataFile::ObjectLoader @@ -48,6 +47,7 @@ private: float advance; }; +private: typedef std::map GlyphMap; RefPtr texture; @@ -61,9 +61,8 @@ public: 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(const Glyph &); float get_native_size() const { return native_size; } - float get_default_size() const { return native_size; } // Deprecated float get_ascent() const { return ascent; } float get_descent() const { return descent; }