X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpart.cpp;h=aacc52adc28048372c6353dfe8b9a78c2acb72d5;hb=103ceeace366c6d80fce323438b31b9bbc167915;hp=4726b4c007daed4e665d64b13cadf76e28e8fc2b;hpb=601e9fbcfdb26b53aff4d44805bb596f0b73208a;p=libs%2Fgltk.git

diff --git a/source/part.cpp b/source/part.cpp
index 4726b4c..aacc52a 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
 {
@@ -31,7 +29,7 @@ void Part::build(const Geometry &parent, State state, PartCache &cache) const
 	Geometry rgeom = geom;
 	align.apply(rgeom, parent, margin);
 	GL::MeshBuilder bld(cache.create_mesh(*this, *graphic[state]->get_texture()));
-	bld.matrix() *= GL::Matrix::translation(rgeom.x, rgeom.y, 0);
+	bld.transform(GL::Matrix::translation(rgeom.x, rgeom.y, 0));
 	graphic[state]->build(rgeom.w, rgeom.h, bld);
 }
 
@@ -46,7 +44,7 @@ Part::Loader::Loader(Part &p, Resources &r):
 	add("size",    &Loader::size);
 }
 
-Part::Loader::~Loader()
+void Part::Loader::finish()
 {
 	for(unsigned i=0; i<N_STATES_; ++i)
 		if(obj.graphic[i])
@@ -65,7 +63,7 @@ void Part::Loader::graphic_normal(const string &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;