X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffont.cpp;h=61534f0be574a8b0fd485086991157b47b174426;hb=a6463a575c64115dc1ab80ec9b350622778a8f9b;hp=a96fd8f884b329ae74c8b520b82d52d1944d7776;hpb=8ee883aad11511b046461e29ed9f73cf551d0f24;p=libs%2Fgl.git

diff --git a/source/font.cpp b/source/font.cpp
index a96fd8f8..61534f0b 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"
@@ -33,7 +26,7 @@ void Font::set_texture(const Texture2D &t)
 const Texture2D &Font::get_texture() const
 {
 	if(!texture)
-		throw InvalidState("No texture");
+		throw logic_error("No texture");
 	return *texture;
 }
 
@@ -53,7 +46,7 @@ void Font::add_glyph(unsigned code, float x1, float y1, float x2, float y2, floa
 	glyphs.insert(GlyphMap::value_type(code, glyph));
 }
 
-float Font::get_string_width(const string &str, Codecs::Decoder &dec) const
+float Font::get_string_width(const string &str, StringCodec::Decoder &dec) const
 {
 	float x = 0;
 
@@ -63,16 +56,17 @@ float Font::get_string_width(const string &str, Codecs::Decoder &dec) const
 	return x;
 }
 
-void Font::draw_string(const string &str, Codecs::Decoder &dec) const
+void Font::draw_string(const string &str, StringCodec::Decoder &dec, const Color &color) const
 {
+	Bind bind_tex(get_texture(), true);
 	Immediate imm((TEXCOORD2, COLOR4_UBYTE, VERTEX2));
-	draw_string(str, dec, imm);
+	imm.color(color);
+	build_string(str, dec, imm);
 }
 
-void Font::draw_string(const string &str, Codecs::Decoder &dec, PrimitiveBuilder &bld) const
+void Font::build_string(const string &str, StringCodec::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();)
@@ -129,10 +123,6 @@ void Font::Loader::init()
 	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)
@@ -152,7 +142,7 @@ void Font::Loader::texture()
 
 void Font::Loader::texture_ref(const string &name)
 {
-	obj.texture = get_collection().get<Texture2D>(name);
+	obj.texture = &get_collection().get<Texture2D>(name);
 	obj.texture.keep();
 }