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

diff --git a/source/font.cpp b/source/font.cpp
index bbbc40ed..323152dc 100644
--- a/source/font.cpp
+++ b/source/font.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <msp/datafile/collection.h>
 #include "bindable.h"
 #include "gl.h"
@@ -19,33 +12,22 @@ namespace Msp {
 namespace GL {
 
 Font::Font():
-	tex(0),
-	own_tex(false),
-	default_size(1),
+	native_size(1),
 	ascent(1),
 	descent(0)
 { }
 
-Font::~Font()
-{
-	if(own_tex)
-		delete tex;
-}
-
 void Font::set_texture(const Texture2D &t)
 {
-	if(own_tex)
-		delete tex;
-
-	tex = &t;
-	own_tex = false;
+	texture = &t;
+	texture.keep();
 }
 
 const Texture2D &Font::get_texture() const
 {
-	if(!tex)
+	if(!texture)
 		throw InvalidState("No texture");
-	return *tex;
+	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)
@@ -76,44 +58,38 @@ float Font::get_string_width(const string &str, Codecs::Decoder &dec) const
 
 void Font::draw_string(const string &str, Codecs::Decoder &dec) const
 {
-	Immediate imm((TEXCOORD2, VERTEX2));
+	Immediate imm((TEXCOORD2, COLOR4_UBYTE, VERTEX2));
 	draw_string(str, dec, imm);
 }
 
-void Font::draw_string(const string &str, Codecs::Decoder &dec, PrimitiveBuilder &pbuilder) const
+void Font::draw_string(const string &str, Codecs::Decoder &dec, PrimitiveBuilder &bld) const
 {
-	if(!tex)
-		throw InvalidState("No texture");
+	MatrixStack::Push push_mtx(bld.matrix());
+	Bind bind_tex(get_texture(), true);
 
-	Bind bind_tex(tex, true);
-
-	float x = 0;
-	unsigned count = 0;
-
-	pbuilder.begin(QUADS);
+	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, pbuilder, x);
-		x += j->second.advance;
-		count += 4;
+		create_glyph_vertices(j->second, bld);
+		bld.matrix() *= Matrix::translation(j->second.advance, 0, 0);
 	}
-	pbuilder.end();
+	bld.end();
 }
 
-void Font::create_glyph_vertices(const Glyph &glyph, VertexBuilder &vbuilder, float x) const
+void Font::create_glyph_vertices(const Glyph &glyph, VertexBuilder &bld) const
 {
-	vbuilder.texcoord(glyph.x1, glyph.y1);
-	vbuilder.vertex(x+glyph.off_x, glyph.off_y);
-	vbuilder.texcoord(glyph.x2, glyph.y1);
-	vbuilder.vertex(x+glyph.off_x+glyph.w, glyph.off_y);
-	vbuilder.texcoord(glyph.x2, glyph.y2);
-	vbuilder.vertex(x+glyph.off_x+glyph.w, glyph.off_y+glyph.h);
-	vbuilder.texcoord(glyph.x1, glyph.y2);
-	vbuilder.vertex(x+glyph.off_x, glyph.off_y+glyph.h);
+	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
@@ -140,12 +116,16 @@ Font::Loader::Loader(Font &f, Collection &c):
 
 void Font::Loader::init()
 {
-	add("default_size", &Font::default_size);
-	add("ascent",  &Font::ascent);
-	add("descent", &Font::descent);
-	add("texture", &Font::tex);
-	add("texture_inline", &Loader::texture_inline);
-	add("glyph",   &Loader::glyph);
+	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)
@@ -156,12 +136,17 @@ void Font::Loader::glyph(unsigned c)
 	obj.glyphs.insert(GlyphMap::value_type(c, gl));
 }
 
-void Font::Loader::texture_inline()
+void Font::Loader::texture()
 {
 	RefPtr<Texture2D> tex = new Texture2D;
 	load_sub(*tex);
-	obj.tex = tex.release();
-	obj.own_tex = true;
+	obj.texture = tex;
+}
+
+void Font::Loader::texture_ref(const string &name)
+{
+	obj.texture = get_collection().get<Texture2D>(name);
+	obj.texture.keep();
 }