X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Ftext.cpp;h=a51d2cf16778a82bc3778c47203a618f39b5cc91;hb=9e63512930bc7dace6dc169c65161961e5dcfcf6;hp=5305de4bd5b46db5f12874aa9a03ec73e27bcd8c;hpb=5bb193f930fb8738d099d630c4d625d82c1215b5;p=libs%2Fgl.git diff --git a/source/render/text.cpp b/source/render/text.cpp index 5305de4b..a51d2cf1 100644 --- a/source/render/text.cpp +++ b/source/render/text.cpp @@ -13,10 +13,7 @@ namespace GL { Text::Text(const Font &f, const Technique *tech, Tag tex_slot): ObjectInstance(object), font(f), - mesh((TEXCOORD2, VERTEX2)), - horz_align(0.0f), - vert_offset(0.0f), - width(0.0f) + mesh((TEXCOORD2, VERTEX2)) { object.set_mesh(&mesh); if(tech) @@ -27,8 +24,8 @@ void Text::set_technique(const Technique *tech, Tag tex_slot) { if(tech) { - if(!tex_slot.id && tech->has_pass(Tag())) - if(const Program *shprog = tech->get_pass(Tag()).get_shader_program()) + if(!tex_slot.id && tech->has_method(Tag())) + if(const Program *shprog = tech->get_method(Tag()).get_shader_program()) { if(shprog->get_uniform_location(Tag("font_tex"))>=0) tex_slot = "font_tex";