X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftext.cpp;h=f791c3b269632e1ed2113554d8095f55182102c2;hp=85647a83980b9fbc0bdf45514460859a8c98a6f2;hb=00cc52f21b5ae29fb1b25c162552c851a0559e66;hpb=8d6b9ced7f03109f477838b50cbdfdddeb9c919e diff --git a/source/text.cpp b/source/text.cpp index 85647a83..f791c3b2 100644 --- a/source/text.cpp +++ b/source/text.cpp @@ -23,7 +23,7 @@ void Text::set_technique(const Technique *tech) if(tech) { technique = *tech; - technique.replace_texture("diffusemap", font.get_texture()); + technique.replace_texture("diffuse_map", font.get_texture()); object.set_technique(&technique); } else @@ -34,7 +34,7 @@ void Text::set_text(const string &text, StringCodec::Decoder &dec) { clear(); width = font.get_string_width(text, dec); - GL::MeshBuilder bld(mesh); + MeshBuilder bld(mesh); bld.matrix() *= Matrix::translation(Vector3(-horz_align*width, vert_offset, 0.0f)); font.build_string(text, dec, bld); }