Use triangle strips instead of quads

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

diff --git a/source/image.cpp b/source/image.cpp
index a2d44269b86a394115d696796cbc8fbb6fbb5f7c..f1180c39e1664491fd239560d59f251b8194074a 100644 (file)
--- a/source/image.cpp
+++ b/source/image.cpp
@@ -15,29 +15,22 @@ Image::Image(const GL::Texture2D *i):
        focusable = false;
 }
 
-void Image::autosize()
+void Image::autosize_special(const Part &part, Geometry &ageom) const
 {
-       if(!style)
-               return;
-
-       Widget::autosize();
-
-       if(const Part *image_part = style->get_part("image"))
+       if(part.get_name()=="image")
        {
-               const Sides &margin = image_part->get_margin();
+               const Sides &margin = part.get_margin();
                if(image)
                {
-                       geom.w = max(geom.w, image->get_width()+margin.left+margin.right);
-                       geom.h = max(geom.h, image->get_height()+margin.top+margin.bottom);
+                       ageom.w = max(ageom.w, image->get_width()+margin.left+margin.right);
+                       ageom.h = max(ageom.h, image->get_height()+margin.top+margin.bottom);
                }
                else
                {
-                       geom.w = max(geom.w, margin.left+margin.right);
-                       geom.h = max(geom.h, margin.top+margin.bottom);
+                       ageom.w = max(ageom.w, margin.left+margin.right);
+                       ageom.h = max(ageom.h, margin.top+margin.bottom);
                }
        }
-
-       rebuild();
 }
 
 void Image::set_image(const GL::Texture2D *i)
@@ -53,15 +46,12 @@ void Image::set_keep_aspect(bool ka)
        rebuild();
 }
 
-void Image::rebuild_special(const Part &part, CachedPart &cache)
+void Image::rebuild_special(const Part &part)
 {
        if(part.get_name()=="image")
        {
                if(!image)
-               {
-                       cache.texture = 0;
                        return;
-               }
 
                const Alignment &align = part.get_alignment();
                Geometry rgeom = part.get_geometry();
@@ -84,20 +74,17 @@ void Image::rebuild_special(const Part &part, CachedPart &cache)
                        }
                }
 
-               cache.texture = image;
-               cache.clear_mesh();
-
-               GL::MeshBuilder bld(*cache.mesh);
+               GL::MeshBuilder bld(part_cache.create_mesh(part, *image));
                bld.color(1.0f, 1.0f, 1.0f);
-               bld.begin(GL::QUADS);
+               bld.begin(GL::TRIANGLE_STRIP);
+               bld.texcoord(0.0, 1.0);
+               bld.vertex(rgeom.x, rgeom.y+rgeom.h);
                bld.texcoord(0.0, 0.0);
                bld.vertex(rgeom.x, rgeom.y);
-               bld.texcoord(1.0, 0.0);
-               bld.vertex(rgeom.x+rgeom.w, rgeom.y);
                bld.texcoord(1.0, 1.0);
                bld.vertex(rgeom.x+rgeom.w, rgeom.y+rgeom.h);
-               bld.texcoord(0.0, 1.0);
-               bld.vertex(rgeom.x, rgeom.y+rgeom.h);
+               bld.texcoord(1.0, 0.0);
+               bld.vertex(rgeom.x+rgeom.w, rgeom.y);
                bld.end();
        }
 }