Distributed under the LGPL
*/
+#include <msp/datafile/collection.h>
#include "gl.h"
#include "font.h"
#include "immediate.h"
if(own_tex)
delete tex;
- tex=&t;
- own_tex=false;
+ tex = &t;
+ own_tex = false;
}
const Texture2D &Font::get_texture() const
void Font::add_glyph(unsigned code, float x1, float y1, float x2, float y2, float w, float h, float ox, float oy, float adv)
{
Glyph glyph;
- glyph.code=code;
- glyph.x1=x1;
- glyph.y1=y1;
- glyph.x2=x2;
- glyph.y2=y2;
- glyph.w=w;
- glyph.h=h;
- glyph.off_x=ox;
- glyph.off_y=oy;
- glyph.advance=adv;
+ glyph.code = code;
+ glyph.x1 = x1;
+ glyph.y1 = y1;
+ glyph.x2 = x2;
+ glyph.y2 = y2;
+ glyph.w = w;
+ glyph.h = h;
+ glyph.off_x = ox;
+ glyph.off_y = oy;
+ glyph.advance = adv;
glyphs.insert(GlyphMap::value_type(code, glyph));
}
float Font::get_string_width(const string &str, Codecs::Decoder &dec) const
{
- float x=0;
+ float x = 0;
for(string::const_iterator i=str.begin(); i!=str.end();)
- x+=get_glyph_advance(dec.decode_char(str, i));
+ x += get_glyph_advance(dec.decode_char(str, i));
return x;
}
tex->bind();
- float x=0;
- unsigned count=0;
+ float x = 0;
+ unsigned count = 0;
pbuilder.begin(QUADS);
for(string::const_iterator i=str.begin(); i!=str.end();)
{
- GlyphMap::const_iterator j=glyphs.find(dec.decode_char(str, i));
+ GlyphMap::const_iterator j = glyphs.find(dec.decode_char(str, i));
if(j==glyphs.end())
continue;
create_glyph_vertices(j->second, pbuilder, x);
- x+=j->second.advance;
- count+=4;
+ x += j->second.advance;
+ count += 4;
}
pbuilder.end();
}
float Font::get_glyph_advance(unsigned code) const
{
- GlyphMap::const_iterator i=glyphs.find(code);
+ GlyphMap::const_iterator i = glyphs.find(code);
if(i==glyphs.end())
return 0;
Font::Loader::Loader(Font &f):
- font(f),
- coll(0)
+ DataFile::CollectionObjectLoader<Font>(f, 0)
{
init();
}
Font::Loader::Loader(Font &f, Collection &c):
- font(f),
- coll(&c)
+ DataFile::CollectionObjectLoader<Font>(f, &c)
{
init();
}
-DataFile::Collection &Font::Loader::get_collection()
-{
- if(!coll)
- throw InvalidState("No collection");
- return *coll;
-}
-
void Font::Loader::init()
{
add("default_size", &Font::default_size);
void Font::Loader::glyph(unsigned c)
{
Glyph gl;
- gl.code=c;
+ gl.code = c;
load_sub(gl);
- font.glyphs.insert(GlyphMap::value_type(c, gl));
+ obj.glyphs.insert(GlyphMap::value_type(c, gl));
}
void Font::Loader::texture_inline()
{
- RefPtr<Texture2D> tex=new Texture2D;
+ RefPtr<Texture2D> tex = new Texture2D;
load_sub(*tex);
- font.tex=tex.release();
- font.own_tex=true;
+ obj.tex = tex.release();
+ obj.own_tex = true;
}
Font::Glyph::Loader::Loader(Glyph &g):
- glyph(g)
+ DataFile::ObjectLoader<Glyph>(g)
{
add("texcoords", &Loader::texcoords);
add("size", &Glyph::w, &Glyph::h);
void Font::Glyph::Loader::texcoords(float x1, float y1, float x2, float y2)
{
- glyph.x1=x1;
- glyph.y1=y1;
- glyph.x2=x2;
- glyph.y2=y2;
+ obj.x1 = x1;
+ obj.y1 = y1;
+ obj.x2 = x2;
+ obj.y2 = y2;
}
} // namespace GL