Change font methods to better differentiate between drawing and building

diff --git a/source/font.cpp b/source/font.cpp
index c96ec7507aeee520962acf37fcdb2c4a997f4a17..d03ce281aeae55e6c95daf327ad401e63059164b 100644 (file)
--- a/source/font.cpp
+++ b/source/font.cpp
@@ -56,16 +56,17 @@ float Font::get_string_width(const string &str, StringCodec::Decoder &dec) const
        return x;
 }
 
-void Font::draw_string(const string &str, StringCodec::Decoder &dec) const
+void Font::draw_string(const string &str, StringCodec::Decoder &dec, const Color &color) const
 {
+       Bind bind_tex(get_texture(), true);
        Immediate imm((TEXCOORD2, COLOR4_UBYTE, VERTEX2));
-       draw_string(str, dec, imm);
+       imm.color(color);
+       build_string(str, dec, imm);
 }
 
-void Font::draw_string(const string &str, StringCodec::Decoder &dec, PrimitiveBuilder &bld) const
+void Font::build_string(const string &str, StringCodec::Decoder &dec, PrimitiveBuilder &bld) const
 {
        MatrixStack::Push push_mtx(bld.matrix());
-       Bind bind_tex(get_texture(), true);
 
        bld.begin(QUADS);
        for(string::const_iterator i=str.begin(); i!=str.end();)

diff --git a/source/font.h b/source/font.h
index 14320b8fed58ff1b9d3fefe01c82c474c631f505..21c202d795ef04a5fd4ec08957dddf44e0c9b0f3 100644 (file)
--- a/source/font.h
+++ b/source/font.h
@@ -79,28 +79,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;