Change Font::add_glyph to take a glyph struct

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

diff --git a/source/font.h b/source/font.h
index 14320b8fed58ff1b9d3fefe01c82c474c631f505..6f8f35ff1db4be61fc52af060e1daade7ae73496 100644 (file)
--- 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<Glyph>
@@ -48,6 +47,7 @@ private:
                float advance;
        };
 
+private:
        typedef std::map<unsigned, Glyph> GlyphMap;
 
        RefPtr<const Texture2D> 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; }
 
@@ -79,28 +78,34 @@ public:
        float get_string_width(const std::string &str) const
        { return get_string_width<StringCodec::Utf8>(str); }
 
-       void draw_string(const std::string &, StringCodec::Decoder &) const;
-       void draw_string(const std::string &, StringCodec::Decoder &, PrimitiveBuilder &) const;
+       /// Draws a string to the framebuffer with Immediate.
+       void draw_string(const std::string &, StringCodec::Decoder &, const Color & = Color()) const;
 
        template<class C>
-       void draw_string(const std::string &str) const
+       void draw_string(const std::string &str, const Color &color = Color()) const
        {
                typename C::Decoder dec;
-               draw_string(str, dec);
+               draw_string(str, dec, color);
        }
 
-       void draw_string(const std::string &str) const
-       { draw_string<StringCodec::Utf8>(str); }
+       void draw_string(const std::string &str, const Color &color = Color()) const
+       { draw_string<StringCodec::Utf8>(str, color); }
+
+       /** Builds the primitives for a string.  The PrimitiveBuilder should be
+       associated with a target that has at least VERTEX2 and TEXCOORD2 components.
+       The texture is not bound, to avoid unnecessary bindings when creating
+       meshes. */
+       void build_string(const std::string &, StringCodec::Decoder &, PrimitiveBuilder &) const;
 
        template<class C>
-       void draw_string(const std::string &str, PrimitiveBuilder &pb) const
+       void build_string(const std::string &str, PrimitiveBuilder &pb) const
        {
                typename C::Decoder dec;
-               draw_string(str, dec, pb);
+               build_string(str, dec, pb);
        }
 
-       void draw_string(const std::string &str, PrimitiveBuilder &pb) const
-       { return draw_string<StringCodec::Utf8>(str, pb); }
+       void build_string(const std::string &str, PrimitiveBuilder &pb) const
+       { return build_string<StringCodec::Utf8>(str, pb); }
 
 private:
        void create_glyph_vertices(const Glyph &, VertexBuilder &) const;