#include <map>
#include <string>
-#include <msp/datafile/loader.h>
-#include <msp/strings/codec.h>
+#include <msp/datafile/collection.h>
+#include <msp/strings/utf8.h>
#include "vertexarray.h"
namespace Msp {
class Font
{
public:
- class Loader: public Msp::DataFile::Loader
+ class Loader: public DataFile::Loader
{
+ private:
+ Font &font;
+ DataFile::Collection *coll;
+
public:
+ typedef DataFile::Collection Collection;
+
Loader(Font &);
+ Loader(Font &, DataFile::Collection &);
~Loader();
Font &get_object() { return font; }
+ DataFile::Collection &get_collection();
private:
- Font &font;
-
+ void init();
void texture(const std::string &);
void glyph(unsigned);
};
Font();
- ~Font();
void set_texture(const Texture2D &);
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;
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); }
+
private:
struct Glyph
{
typedef std::map<unsigned, Glyph> GlyphMap;
const Texture2D *tex;
- bool own_tex;
float default_size;
float ascent;
float descent;