X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ffont.h;h=9f040dc99d0e45cc5ffdec41153dfc71e5149778;hp=dab09fa400d3ba0381eda46f5f64fb0e5f823883;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hpb=f89300d4264069e50a42c7e26b428957e750b437 diff --git a/source/font.h b/source/font.h index dab09fa4..9f040dc9 100644 --- a/source/font.h +++ b/source/font.h @@ -50,6 +50,8 @@ public: float w, h; float off_x, off_y; float advance; + + Glyph(); }; private: @@ -103,20 +105,6 @@ public: float get_string_width(const std::string &str) const { return get_string_width(str); } - /** Draws a string to the framebuffer with Immediate. It is drawn with size - 1.0; set up matrices for the desired size before the call. */ - void draw_string(const std::string &, StringCodec::Decoder &, const Color & = Color()) const; - - template - void draw_string(const std::string &str, const Color &color = Color()) const - { - typename C::Decoder dec; - draw_string(str, dec, color); - } - - void draw_string(const std::string &str, const Color &color = Color()) const - { draw_string(str, color); } - /** Builds the primitives for a string. Two-dimensional vertex and texture coordinates are generated. Size 1.0 is used for building; set up the builder's matrix before the call. The texture is not bound, to avoid