Support embedding textures inside font files

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

diff --git a/source/font.h b/source/font.h
index 3178a4c2717ed2f64d6d4e2c72bb413b84056a60..a2406b9ee043009824dbe1787fd7a05d6b583038 100644 (file)
--- a/source/font.h
+++ b/source/font.h
@@ -11,12 +11,13 @@ Distributed under the LGPL
 #include <map>
 #include <string>
 #include <msp/datafile/collection.h>
-#include <msp/strings/codec.h>
+#include <msp/strings/utf8.h>
 #include "vertexarray.h"
 
 namespace Msp {
 namespace GL {
 
+class PrimitiveBuilder;
 class Texture2D;
 
 class Font
@@ -33,28 +34,27 @@ public:
 
                Loader(Font &);
                Loader(Font &, DataFile::Collection &);
-               ~Loader();
                Font &get_object() { return font; }
                DataFile::Collection &get_collection();
        private:
                void init();
-               void texture(const std::string &);
                void glyph(unsigned);
+               void texture_inline();
        };
 
        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);
        float get_default_size() const { return default_size; }
        float get_ascent() const { return ascent; }
        float get_descent() const { return descent; }
-       float get_string_width(const std::string &) const;
        float get_string_width(const std::string &, Codecs::Decoder &) const;
        void  draw_glyph(unsigned);
-       void  draw_string(const std::string &) const;
        void  draw_string(const std::string &, Codecs::Decoder &) const;
-       void  draw_multiline(const std::string &) const;
+       void  draw_string(const std::string &, Codecs::Decoder &, PrimitiveBuilder &) const;
 
        template<class C>
        float get_string_width(const std::string &str) const
@@ -63,12 +63,29 @@ public:
                return get_string_width(str, dec);
        }
 
+       float get_string_width(const std::string &str) const
+       { return get_string_width<Codecs::Utf8>(str); }
+
        template<class C>
        void draw_string(const std::string &str) const
        {
                typename C::Decoder dec;
                draw_string(str, dec);
        }
+
+       void draw_string(const std::string &str) const
+       { draw_string<Codecs::Utf8>(str); }
+
+       template<class C>
+       void draw_string(const std::string &str, PrimitiveBuilder &pb) const
+       {
+               typename C::Decoder dec;
+               draw_string(str, dec, pb);
+       }
+
+       void draw_string(const std::string &str, PrimitiveBuilder &pb) const
+       { return draw_string<Codecs::Utf8>(str, pb); }
+
 private:
        struct Glyph
        {
@@ -89,21 +106,17 @@ private:
                float w,h;
                float off_x, off_y;
                float advance;
-               unsigned index;
        };
        typedef std::map<unsigned, Glyph> GlyphMap;
 
        const Texture2D *tex;
+       bool     own_tex;
        float    default_size;
        float    ascent;
        float    descent;
        GlyphMap glyphs;
-       VertexArray varray;
 
-       void create_glyph_vertices();
-       void create_glyph_vertices(const Glyph &, VertexArrayBuilder &);
-       void prepare_render() const;
-       void draw_glyph(unsigned) const;
+       void create_glyph_vertices(const Glyph &, VertexBuilder &, float) const;
        float get_glyph_advance(unsigned) const;
 };