-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
#ifndef MSP_GL_FONT_H_
#define MSP_GL_FONT_H_
#include <map>
#include <string>
#include <msp/datafile/objectloader.h>
-#include <msp/strings/utf8.h>
+#include <msp/stringcodec/utf8.h>
#include "vertexarray.h"
namespace Msp {
public:
Loader(Font &);
Loader(Font &, Collection &);
+
private:
void init();
void glyph(unsigned);
- void texture_inline();
+ void texture();
+ void texture_ref(const std::string &);
};
private:
typedef std::map<unsigned, Glyph> GlyphMap;
- const Texture2D *tex;
- bool own_tex;
- float default_size;
+ RefPtr<const Texture2D> texture;
+ float native_size;
float ascent;
float descent;
GlyphMap glyphs;
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);
- float get_default_size() const { return default_size; }
+ 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;
+ float get_string_width(const std::string &, StringCodec::Decoder &) 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); }
+ { return get_string_width<StringCodec::Utf8>(str); }
- void draw_string(const std::string &, Codecs::Decoder &) const;
- void draw_string(const std::string &, Codecs::Decoder &, PrimitiveBuilder &) const;
+ void draw_string(const std::string &, StringCodec::Decoder &) const;
+ void draw_string(const std::string &, StringCodec::Decoder &, PrimitiveBuilder &) const;
template<class C>
void draw_string(const std::string &str) const
}
void draw_string(const std::string &str) const
- { draw_string<Codecs::Utf8>(str); }
+ { draw_string<StringCodec::Utf8>(str); }
template<class C>
void draw_string(const std::string &str, PrimitiveBuilder &pb) const
}
void draw_string(const std::string &str, PrimitiveBuilder &pb) const
- { return draw_string<Codecs::Utf8>(str, pb); }
+ { return draw_string<StringCodec::Utf8>(str, pb); }
private:
- void create_glyph_vertices(const Glyph &, VertexBuilder &, float) const;
+ void create_glyph_vertices(const Glyph &, VertexBuilder &) const;
float get_glyph_advance(unsigned) const;
};