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);
}
}
}
+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() ? 0 : &get_collection().get<Graphic>(n));
for(int i=0; i<N_STATES_; ++i)
if((i&s)==s)
obj.graphic[i] = grph;