public:
Loader(Font &);
Loader(Font &, Collection &);
+
private:
void init();
void glyph(unsigned);
- void texture_inline();
+ void texture();
+ void texture_ref(const std::string &);
+ };
+
+private:
+ struct Glyph
+ {
+ class Loader: public Msp::DataFile::ObjectLoader<Glyph>
+ {
+ public:
+ Loader(Glyph &);
+ private:
+ void texcoords(float, float, float, float);
+ };
+
+ unsigned code;
+ float x1,y1;
+ float x2,y2;
+ float w,h;
+ float off_x, off_y;
+ float advance;
};
+ typedef std::map<unsigned, Glyph> GlyphMap;
+
+ RefPtr<const Texture2D> texture;
+ float native_size;
+ float ascent;
+ float descent;
+ GlyphMap glyphs;
+
+public:
Font();
- ~Font();
- void set_texture(const Texture2D &);
+ 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; }
+ void add_glyph(unsigned, float, float, float, float, float, float, float, float, 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; }
+
float get_string_width(const std::string &, Codecs::Decoder &) const;
- void draw_glyph(unsigned);
- void draw_string(const std::string &, Codecs::Decoder &) const;
- void draw_string(const std::string &, Codecs::Decoder &, PrimitiveBuilder &) const;
template<class C>
float get_string_width(const std::string &str) const
float get_string_width(const std::string &str) const
{ return get_string_width<Codecs::Utf8>(str); }
+ void draw_string(const std::string &, Codecs::Decoder &) const;
+ void draw_string(const std::string &, Codecs::Decoder &, PrimitiveBuilder &) const;
+
template<class C>
void draw_string(const std::string &str) const
{
{ return draw_string<Codecs::Utf8>(str, pb); }
private:
- struct Glyph
- {
- class Loader: public Msp::DataFile::ObjectLoader<Glyph>
- {
- public:
- Loader(Glyph &);
- private:
- void texcoords(float, float, float, float);
- };
-
- unsigned code;
- float x1,y1;
- float x2,y2;
- float w,h;
- float off_x, off_y;
- float advance;
- };
- typedef std::map<unsigned, Glyph> GlyphMap;
-
- const Texture2D *tex;
- bool own_tex;
- float default_size;
- float ascent;
- float descent;
- GlyphMap glyphs;
-
- void create_glyph_vertices(const Glyph &, VertexBuilder &, float) const;
+ void create_glyph_vertices(const Glyph &, VertexBuilder &) const;
float get_glyph_advance(unsigned) const;
};