X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftext.cpp;h=4d80ad548004f57276ce202ffa4e82fcbdc04daf;hb=c8291177b545ec81930603a5915234a60296db51;hp=af6b17f85e14946b23088909c26cd056dcbe4768;hpb=d5ab14158fee3fa48cb514f19d81b25bf2fe71ab;p=libs%2Fgltk.git diff --git a/source/text.cpp b/source/text.cpp index af6b17f..4d80ad5 100644 --- a/source/text.cpp +++ b/source/text.cpp @@ -158,30 +158,23 @@ Geometry Text::coords_to_geometry(const Part &part, const Geometry &parent, unsi return data.result; } -void Text::build(const Part &part, const Geometry &parent, CachedPart &cache) const +void Text::build(const Part &part, const Geometry &parent, PartCache &cache) const { build(part, parent, 0, cache); } -void Text::build(const Part &part, const Geometry &parent, unsigned first_row, CachedPart &cache) const +void Text::build(const Part &part, const Geometry &parent, unsigned first_row, PartCache &cache) const { if(!style || lines.empty()) - { - cache.texture = 0; return; - } - - cache.clear_mesh(); - GL::MeshBuilder bld(*cache.mesh); const GL::Font &font = style->get_font(); + GL::MeshBuilder bld(cache.create_mesh(part, font.get_texture())); bld.color(style->get_font_color()); RenderData data; data.bld = &bld; - cache.texture = &font.get_texture(); - process_lines(part, parent, first_row, data); }