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