Improve widget part caching

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

diff --git a/source/button.cpp b/source/button.cpp
index 5f9b18bfdf3290a830d4bc392b126d0be3649a19..5582230f95985fc05be05869fa1961c718fc22b2 100644 (file)
--- a/source/button.cpp
+++ b/source/button.cpp
@@ -1,4 +1,4 @@
-#include <msp/gl/immediate.h>
+#include <msp/gl/meshbuilder.h>
 #include "button.h"
 #include "part.h"
 #include "style.h"
@@ -39,44 +39,49 @@ void Button::autosize()
                        geom.h = max(geom.h, icon->get_height()+margin.top+margin.bottom);
                }
        }
+
+       rebuild();
 }
 
 void Button::set_text(const std::string &t)
 {
        text = t;
        signal_autosize_changed.emit();
+       rebuild();
 }
 
 void Button::set_icon(const GL::Texture2D *i)
 {
        icon = i;
+       rebuild();
 }
 
-void Button::render_special(const Part &part) const
+void Button::rebuild_special(const Part &part)
 {
        if(part.get_name()=="text")
-               text.render(part, geom);
-       if(part.get_name()=="icon" && icon)
+               text.build(part, geom, part_cache);
+       if(part.get_name()=="icon")
        {
-               Geometry rgeom;
-               rgeom.w = icon->get_width();
-               rgeom.h = icon->get_height();
-               part.get_alignment().apply(rgeom, geom, part.get_margin());
-
-               icon->bind();
-               GL::Immediate imm((GL::COLOR4_UBYTE, GL::TEXCOORD2, GL::VERTEX2));
-               imm.color(1.0f, 1.0f, 1.0f);
-               imm.begin(GL::QUADS);
-               imm.texcoord(0, 0);
-               imm.vertex(rgeom.x, rgeom.y);
-               imm.texcoord(1, 0);
-               imm.vertex(rgeom.x+rgeom.w, rgeom.y);
-               imm.texcoord(1, 1);
-               imm.vertex(rgeom.x+rgeom.w, rgeom.y+rgeom.h);
-               imm.texcoord(0, 1);
-               imm.vertex(rgeom.x, rgeom.y+rgeom.h);
-               imm.end();
-               GL::Texture::unbind();
+               if(icon)
+               {
+                       Geometry rgeom;
+                       rgeom.w = icon->get_width();
+                       rgeom.h = icon->get_height();
+                       part.get_alignment().apply(rgeom, geom, part.get_margin());
+
+                       GL::MeshBuilder bld(part_cache.create_mesh(part, *icon));
+                       bld.color(1.0f, 1.0f, 1.0f);
+                       bld.begin(GL::QUADS);
+                       bld.texcoord(0, 0);
+                       bld.vertex(rgeom.x, rgeom.y);
+                       bld.texcoord(1, 0);
+                       bld.vertex(rgeom.x+rgeom.w, rgeom.y);
+                       bld.texcoord(1, 1);
+                       bld.vertex(rgeom.x+rgeom.w, rgeom.y+rgeom.h);
+                       bld.texcoord(0, 1);
+                       bld.vertex(rgeom.x, rgeom.y+rgeom.h);
+                       bld.end();
+               }
        }
 }
 
@@ -119,14 +124,14 @@ void Button::on_style_change()
 
 
 Button::Loader::Loader(Button &btn):
-       Widget::Loader(btn)
+       DataFile::DerivedObjectLoader<Button, Widget::Loader>(btn)
 {
        add("text", &Loader::text);
 }
 
 void Button::Loader::text(const std::string &t)
 {
-       static_cast<Button &>(obj).text = t;
+       obj.text = t;
 }
 
 } // namespace GLtk