X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ffont.cpp;h=3fd24d8ea0ebde029e262d137dcfaf509b0db5ee;hp=323152dc74b220c6730e024cef11f9ce59637f50;hb=HEAD;hpb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8

diff --git a/source/font.cpp b/source/font.cpp
deleted file mode 100644
index 323152dc..00000000
--- a/source/font.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-#include <msp/datafile/collection.h>
-#include "bindable.h"
-#include "gl.h"
-#include "font.h"
-#include "immediate.h"
-#include "primitivetype.h"
-#include "texture2d.h"
-
-using namespace std;
-
-namespace Msp {
-namespace GL {
-
-Font::Font():
-	native_size(1),
-	ascent(1),
-	descent(0)
-{ }
-
-void Font::set_texture(const Texture2D &t)
-{
-	texture = &t;
-	texture.keep();
-}
-
-const Texture2D &Font::get_texture() const
-{
-	if(!texture)
-		throw InvalidState("No texture");
-	return *texture;
-}
-
-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;
-	glyphs.insert(GlyphMap::value_type(code, glyph));
-}
-
-float Font::get_string_width(const string &str, Codecs::Decoder &dec) const
-{
-	float x = 0;
-
-	for(string::const_iterator i=str.begin(); i!=str.end();)
-		x += get_glyph_advance(dec.decode_char(str, i));
-
-	return x;
-}
-
-void Font::draw_string(const string &str, Codecs::Decoder &dec) const
-{
-	Immediate imm((TEXCOORD2, COLOR4_UBYTE, VERTEX2));
-	draw_string(str, dec, imm);
-}
-
-void Font::draw_string(const string &str, Codecs::Decoder &dec, PrimitiveBuilder &bld) const
-{
-	MatrixStack::Push push_mtx(bld.matrix());
-	Bind bind_tex(get_texture(), true);
-
-	bld.begin(QUADS);
-	for(string::const_iterator i=str.begin(); i!=str.end();)
-	{
-		GlyphMap::const_iterator j = glyphs.find(dec.decode_char(str, i));
-		if(j==glyphs.end())
-			continue;
-
-		create_glyph_vertices(j->second, bld);
-		bld.matrix() *= Matrix::translation(j->second.advance, 0, 0);
-	}
-	bld.end();
-}
-
-void Font::create_glyph_vertices(const Glyph &glyph, VertexBuilder &bld) const
-{
-	bld.texcoord(glyph.x1, glyph.y1);
-	bld.vertex(glyph.off_x, glyph.off_y);
-	bld.texcoord(glyph.x2, glyph.y1);
-	bld.vertex(glyph.off_x+glyph.w, glyph.off_y);
-	bld.texcoord(glyph.x2, glyph.y2);
-	bld.vertex(glyph.off_x+glyph.w, glyph.off_y+glyph.h);
-	bld.texcoord(glyph.x1, glyph.y2);
-	bld.vertex(glyph.off_x, glyph.off_y+glyph.h);
-}
-
-float Font::get_glyph_advance(unsigned code) const
-{
-	GlyphMap::const_iterator i = glyphs.find(code);
-	if(i==glyphs.end())
-		return 0;
-
-	return i->second.advance;
-}
-
-
-Font::Loader::Loader(Font &f):
-	DataFile::CollectionObjectLoader<Font>(f, 0)
-{
-	init();
-}
-
-Font::Loader::Loader(Font &f, Collection &c):
-	DataFile::CollectionObjectLoader<Font>(f, &c)
-{
-	init();
-}
-
-void Font::Loader::init()
-{
-	add("native_size", &Font::native_size);
-	add("ascent",      &Font::ascent);
-	add("descent",     &Font::descent);
-	add("texture",     &Loader::texture);
-	add("texture",     &Loader::texture_ref);
-	add("glyph",       &Loader::glyph);
-
-	// Deprecated aliases
-	add("default_size",   &Font::native_size);
-	add("texture_inline", &Loader::texture);
-}
-
-void Font::Loader::glyph(unsigned c)
-{
-	Glyph gl;
-	gl.code = c;
-	load_sub(gl);
-	obj.glyphs.insert(GlyphMap::value_type(c, gl));
-}
-
-void Font::Loader::texture()
-{
-	RefPtr<Texture2D> tex = new Texture2D;
-	load_sub(*tex);
-	obj.texture = tex;
-}
-
-void Font::Loader::texture_ref(const string &name)
-{
-	obj.texture = get_collection().get<Texture2D>(name);
-	obj.texture.keep();
-}
-
-
-Font::Glyph::Loader::Loader(Glyph &g):
-	DataFile::ObjectLoader<Glyph>(g)
-{
-	add("texcoords", &Loader::texcoords);
-	add("size",      &Glyph::w,     &Glyph::h);
-	add("offset",    &Glyph::off_x, &Glyph::off_y);
-	add("advance",   &Glyph::advance);
-}
-
-void Font::Glyph::Loader::texcoords(float x1, float y1, float x2, float y2)
-{
-	obj.x1 = x1;
-	obj.y1 = y1;
-	obj.x2 = x2;
-	obj.y2 = y2;
-}
-
-} // namespace GL
-} // namespace Msp