Minor fixes, courtesy of Apple's compiler

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

diff --git a/source/font.h b/source/font.h
index 14320b8fed58ff1b9d3fefe01c82c474c631f505..5fcc63c4414dee39064c7a63fcd92bd35497d4a2 100644 (file)
--- a/source/font.h
+++ b/source/font.h
@@ -25,11 +25,11 @@ public:
        private:
                void init();
                void glyph(unsigned);
+               void kerning(unsigned, unsigned, float);
                void texture();
                void texture_ref(const std::string &);
        };
 
-private:
        struct Glyph
        {
                class Loader: public Msp::DataFile::ObjectLoader<Glyph>
@@ -48,22 +48,27 @@ private:
                float advance;
        };
 
+private:
        typedef std::map<unsigned, Glyph> GlyphMap;
+       typedef std::pair<unsigned, unsigned> KerningKey;
+       typedef std::map<KerningKey, float> KerningMap;
 
        RefPtr<const Texture2D> texture;
        float native_size;
        float ascent;
        float descent;
        GlyphMap glyphs;
+       KerningMap kerning;
 
 public:
        Font();
+       ~Font();
 
        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 &);
+       void set_kerning(unsigned, unsigned, float);
        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,32 +84,38 @@ 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;
-       float get_glyph_advance(unsigned) const;
+       float get_glyph_advance(unsigned, unsigned = 0) const;
 };
 
 } // namespace GL