X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ffont.cpp;h=5990c57d7223771410edadcfb69a9df13ea39fe0;hp=623f1ebebda04df2e97909b66c51416602e694a6;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hpb=a40fc85277dba5c34402a0e703d038efd30cc57b diff --git a/source/font.cpp b/source/font.cpp index 623f1ebe..5990c57d 100644 --- a/source/font.cpp +++ b/source/font.cpp @@ -3,8 +3,7 @@ #include "bindable.h" #include "gl.h" #include "font.h" -#include "immediate.h" -#include "primitivetype.h" +#include "primitivebuilder.h" #include "texture2d.h" using namespace std; @@ -64,14 +63,6 @@ float Font::get_string_width(const string &str, StringCodec::Decoder &dec) const return x; } -void Font::draw_string(const string &str, StringCodec::Decoder &dec, const Color &color) const -{ - BindRestore bind_tex(get_texture()); - Immediate imm((TEXCOORD2, COLOR4_UBYTE, VERTEX2)); - imm.color(color); - build_string(str, dec, imm); -} - void Font::build_string(const string &str, StringCodec::Decoder &dec, PrimitiveBuilder &bld) const { VertexBuilder::PushMatrix push_mtx(bld);