X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpart.cpp;h=7c98545c87a49ea5442b88a4463bfaf1c18c620b;hb=754751fd474c6eac073fa7e89a18142fc89cb4fb;hp=7037d4b3384374568bc662a9edc1df3299776ba3;hpb=1aa6cd9b865e366737dcc9d2d36c4f8faed5bc4f;p=libs%2Fgltk.git

diff --git a/source/part.cpp b/source/part.cpp
index 7037d4b..7c98545 100644
--- a/source/part.cpp
+++ b/source/part.cpp
@@ -12,8 +12,7 @@ namespace GLtk {
 Part::Part(const string &n):
 	name(n)
 {
-	for(unsigned i=0; i<N_STATES_; ++i)
-		graphic[i] = 0;
+	fill(graphic, graphic+N_STATES_, static_cast<Graphic *>(0));
 }
 
 const Graphic *Part::get_graphic(State state) const
@@ -24,20 +23,14 @@ const Graphic *Part::get_graphic(State state) const
 	return graphic[state];
 }
 
-void Part::build(const Geometry &parent, State state, CachedPart &cache) const
+void Part::build(const Geometry &parent, State state, PartCache &cache) const
 {
-	if(!graphic[state])
-	{
-		cache.texture = 0;
+	if(!graphic[state] || !graphic[state]->get_texture())
 		return;
-	}
-
-	cache.texture = graphic[state]->get_texture();
-	cache.clear_mesh();
 
 	Geometry rgeom = geom;
 	align.apply(rgeom, parent, margin);
-	GL::MeshBuilder bld(*cache.mesh);
+	GL::MeshBuilder bld(cache.create_mesh(*this, *graphic[state]->get_texture()));
 	bld.matrix() *= GL::Matrix::translation(rgeom.x, rgeom.y, 0);
 	graphic[state]->build(rgeom.w, rgeom.h, bld);
 }