Use triangle strips instead of quads

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

diff --git a/source/button.cpp b/source/button.cpp
index 8e6e7131cb4157c266b096e4bd121931eb68abdb..86b73c9daa0c3f8ba9a689ebf628f102667c97f7 100644 (file)
--- a/source/button.cpp
+++ b/source/button.cpp
@@ -1,13 +1,9 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007, 2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include <msp/gl/immediate.h>
+#include <msp/gl/meshbuilder.h>
 #include "button.h"
 #include "part.h"
+#include "style.h"
+
+using namespace std;
 
 namespace Msp {
 namespace GLtk {
@@ -20,14 +16,58 @@ Button::Button(const std::string &t):
        set_text(t);
 }
 
+void Button::autosize_special(const Part &part, Geometry &ageom) const
+{
+       if(part.get_name()=="text")
+               text.autosize(part, ageom);
+       else if(part.get_name()=="icon" && icon)
+       {
+               const Sides &margin = part.get_margin();
+               ageom.w = max(ageom.w, icon->get_width()+margin.left+margin.right);
+               ageom.h = max(ageom.h, icon->get_height()+margin.top+margin.bottom);
+       }
+}
+
 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::rebuild_special(const Part &part)
+{
+       if(part.get_name()=="text")
+               text.build(part, state, geom, part_cache);
+       if(part.get_name()=="icon")
+       {
+               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::TRIANGLE_STRIP);
+                       bld.texcoord(0, 1);
+                       bld.vertex(rgeom.x, rgeom.y+rgeom.h);
+                       bld.texcoord(0, 0);
+                       bld.vertex(rgeom.x, rgeom.y);
+                       bld.texcoord(1, 1);
+                       bld.vertex(rgeom.x+rgeom.w, rgeom.y+rgeom.h);
+                       bld.texcoord(1, 0);
+                       bld.vertex(rgeom.x+rgeom.w, rgeom.y);
+                       bld.end();
+               }
+       }
 }
 
 void Button::button_press(int, int, unsigned btn)
@@ -35,7 +75,7 @@ void Button::button_press(int, int, unsigned btn)
        if(btn==1)
        {
                pressed = true;
-               state |= ACTIVE;
+               set_state(ACTIVE);
        }
 }
 
@@ -43,7 +83,7 @@ void Button::button_release(int x, int y, unsigned btn)
 {
        if(pressed && btn==1)
        {
-               state &= ~ACTIVE;
+               clear_state(ACTIVE);
                pressed = false;
 
                if(geom.is_inside_relative(x, y))
@@ -56,37 +96,9 @@ void Button::pointer_motion(int x, int y)
        if(pressed)
        {
                if(!geom.is_inside_relative(x, y))
-                       state &= ~ACTIVE;
+                       clear_state(ACTIVE);
                else
-                       state |= ACTIVE;
-       }
-}
-
-void Button::render_special(const Part &part) const
-{
-       if(part.get_name()=="text")
-               text.render(part, geom);
-       if(part.get_name()=="icon" && 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();
+                       set_state(ACTIVE);
        }
 }
 
@@ -97,14 +109,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 &>(wdg).text = t;
+       obj.text = t;
 }
 
 } // namespace GLtk