X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fimage.cpp;h=a2d44269b86a394115d696796cbc8fbb6fbb5f7c;hb=1aa6cd9b865e366737dcc9d2d36c4f8faed5bc4f;hp=bff790427657ae3256596220d68bfd81c657d079;hpb=2accd84fb2f8cc96efea8b3f27e381c2d2749160;p=libs%2Fgltk.git

diff --git a/source/image.cpp b/source/image.cpp
index bff7904..a2d4426 100644
--- a/source/image.cpp
+++ b/source/image.cpp
@@ -1,6 +1,4 @@
-#include <msp/gl/bindable.h>
-#include <msp/gl/immediate.h>
-#include <msp/gl/matrix.h>
+#include <msp/gl/meshbuilder.h>
 #include "image.h"
 #include "part.h"
 #include "style.h"
@@ -38,25 +36,32 @@ void Image::autosize()
 			geom.h = max(geom.h, margin.top+margin.bottom);
 		}
 	}
+
+	rebuild();
 }
 
 void Image::set_image(const GL::Texture2D *i)
 {
 	image = i;
 	signal_autosize_changed.emit();
+	rebuild();
 }
 
 void Image::set_keep_aspect(bool ka)
 {
 	keep_aspect = ka;
+	rebuild();
 }
 
-void Image::render_special(const Part &part) const
+void Image::rebuild_special(const Part &part, CachedPart &cache)
 {
 	if(part.get_name()=="image")
 	{
 		if(!image)
+		{
+			cache.texture = 0;
 			return;
+		}
 
 		const Alignment &align = part.get_alignment();
 		Geometry rgeom = part.get_geometry();
@@ -79,19 +84,21 @@ void Image::render_special(const Part &part) const
 			}
 		}
 
-		GL::Bind _bind_tex(image);
-		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, 0.0);
-		imm.vertex(rgeom.x, rgeom.y);
-		imm.texcoord(1.0, 0.0);
-		imm.vertex(rgeom.x+rgeom.w, rgeom.y);
-		imm.texcoord(1.0, 1.0);
-		imm.vertex(rgeom.x+rgeom.w, rgeom.y+rgeom.h);
-		imm.texcoord(0.0, 1.0);
-		imm.vertex(rgeom.x, rgeom.y+rgeom.h);
-		imm.end();
+		cache.texture = image;
+		cache.clear_mesh();
+
+		GL::MeshBuilder bld(*cache.mesh);
+		bld.color(1.0f, 1.0f, 1.0f);
+		bld.begin(GL::QUADS);
+		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.end();
 	}
 }