X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fpart.cpp;h=22aa378f3f41d52146c473243b821938031ffc0c;hb=70e7a223a069874cda84673a4ca541aa44b12bf2;hp=7c98545c87a49ea5442b88a4463bfaf1c18c620b;hpb=319cde3c06181ba1c3619567525002926d8b4889;p=libs%2Fgltk.git diff --git a/source/part.cpp b/source/part.cpp index 7c98545..22aa378 100644 --- a/source/part.cpp +++ b/source/part.cpp @@ -31,7 +31,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); } @@ -58,9 +58,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(n); + Graphic *grph = (n.empty() ? 0 : &get_collection().get(n)); for(int i=0; i