X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpart.cpp;h=d65fc2efd00e60686151ac1b6185b5e19dd9f3ed;hb=be8ea35fe6eabe4c68d2d337634f21c63c964265;hp=45449932618ec8a692b9b7cd5f20e275e0ad285d;hpb=c062ca892fc6e10f74a76991b5d4b4349c046b5f;p=libs%2Fgltk.git diff --git a/source/part.cpp b/source/part.cpp index 4544993..d65fc2e 100644 --- a/source/part.cpp +++ b/source/part.cpp @@ -7,8 +7,7 @@ using namespace std; namespace Msp { namespace GLtk { -Part::Part(const Resources &r, const string &n): - res(r), +Part::Part(const string &n): name(n), width(1), height(1), @@ -36,8 +35,9 @@ void Part::render(const Geometry &geom, State state) const } -Part::Loader::Loader(Part &p): - part(p) +Part::Loader::Loader(Part &p, Resources &r): + part(p), + res(r) { add("graphic", &Loader::graphic); add("align", &Loader::align); @@ -61,7 +61,7 @@ Part::Loader::~Loader() void Part::Loader::graphic(State s, const string &n) { - part.graphic[s]=&part.res.get_graphic(n); + part.graphic[s]=res.get(n); } void Part::Loader::align(int x, int y)