X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpart.cpp;h=dbccc060e828c8b4b5f1f07a5f650dfc94d638fa;hb=81c4024fb6acf37df702a803dc4efdf82a81525a;hp=f0ee4b920a226bd2108bd946523ae92cf4550447;hpb=eb6eee5fabf05abca4a0434c2a8f8f62c900afec;p=libs%2Fgltk.git

diff --git a/source/part.cpp b/source/part.cpp
index f0ee4b9..dbccc06 100644
--- a/source/part.cpp
+++ b/source/part.cpp
@@ -11,9 +11,7 @@ namespace GLtk {
 
 Part::Part(const string &n):
 	name(n)
-{
-	fill(graphic, graphic+N_STATES_, static_cast<Graphic *>(0));
-}
+{ }
 
 const Graphic *Part::get_graphic(State state) const
 {
@@ -23,21 +21,15 @@ 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);
-	bld.matrix() *= GL::Matrix::translation(rgeom.x, rgeom.y, 0);
+	GL::MeshBuilder bld(cache.create_mesh(*this, *graphic[state]->get_texture()));
+	bld.transform(GL::Matrix::translation(rgeom.x, rgeom.y, 0));
 	graphic[state]->build(rgeom.w, rgeom.h, bld);
 }
 
@@ -64,9 +56,14 @@ Part::Loader::~Loader()
 		}
 }
 
+void Part::Loader::graphic_normal(const string &n)
+{
+	graphic(NORMAL, n);
+}
+
 void Part::Loader::graphic(State s, const string &n)
 {
-	Graphic *grph = &get_collection().get<Graphic>(n);
+	Graphic *grph = (n.empty() ? nullptr : &get_collection().get<Graphic>(n));
 	for(int i=0; i<N_STATES_; ++i)
 		if((i&s)==s)
 			obj.graphic[i] = grph;