Improve widget part caching

[libs/gltk.git] / source / widget.cpp

diff --git a/source/widget.cpp b/source/widget.cpp
index 3d3b0068ad6f394b905d8e6854dafdfeebf9769e..f642004e07c3825fc1a79432f7a3acc237c1dadc 100644 (file)
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -156,19 +156,22 @@ void Widget::rebuild()
        if(!style)
                return;
 
+       part_cache.clear();
        const Style::PartSeq &parts = style->get_parts();
-       list<CachedPart>::iterator j = cached_parts.begin();
-       for(Style::PartSeq::const_iterator i=parts.begin(); i!=parts.end(); ++i, ++j)
+       for(Style::PartSeq::const_iterator i=parts.begin(); i!=parts.end(); ++i)
        {
-               if(j==cached_parts.end())
-                       j = cached_parts.insert(j, CachedPart());
                if(i->get_name().empty())
-                       i->build(geom, state, *j);
+                       i->build(geom, state, part_cache);
                else
-                       rebuild_special(*i, *j);
+                       rebuild_special(*i);
        }
 }
 
+void Widget::rebuild_special(const Part &part)
+{
+       part_cache.insert_special(part);
+}
+
 void Widget::render(GL::Renderer &renderer) const
 {
        if(!style)
@@ -176,17 +179,16 @@ void Widget::render(GL::Renderer &renderer) const
 
        GL::MatrixStack::Push _pushm(renderer.matrix_stack());
        renderer.matrix_stack() *= GL::Matrix::translation(geom.x, geom.y, 0);
-       const Style::PartSeq &parts = style->get_parts();
-       list<CachedPart>::const_iterator j = cached_parts.begin();
-       for(Style::PartSeq::const_iterator i=parts.begin(); (i!=parts.end() && j!=cached_parts.end()); ++i, ++j)
+       const PartCache::PartList &parts = part_cache.get_parts();
+       for(PartCache::PartList::const_iterator i=parts.begin(); i!=parts.end(); ++i)
        {
-               if(j->mesh && j->texture)
+               if(i->mesh && i->texture)
                {
-                       renderer.set_texture(j->texture);
-                       j->mesh->draw(renderer);
+                       renderer.set_texture(i->texture);
+                       i->mesh->draw(renderer);
                }
-               else if(!i->get_name().empty())
-                       render_special(*i, renderer);
+               else if(i->part)
+                       render_special(*i->part, renderer);
        }
 }