Loader improvements

[libs/gltk.git] / source / part.cpp

diff --git a/source/part.cpp b/source/part.cpp
index b75e98ff7491cddca368cfc0061cf0ee8774fe2a..f2797f9058ad66fe8633256c286eb3b794fe8cab 100644 (file)
--- a/source/part.cpp
+++ b/source/part.cpp
@@ -43,8 +43,7 @@ void Part::render(const Geometry &parent, State state) const
 
 
 Part::Loader::Loader(Part &p, Resources &r):
-       part(p),
-       res(r)
+       DataFile::CollectionObjectLoader<Part>(p, &r)
 {
        add("graphic", &Loader::graphic);
        add("align",   &Loader::align);
@@ -56,43 +55,44 @@ Part::Loader::Loader(Part &p, Resources &r):
 Part::Loader::~Loader()
 {
        for(unsigned i=0; i<N_STATES_; ++i)
-               if(part.graphic[i])
+               if(obj.graphic[i])
                {
-                       const Sides &shadow = part.graphic[i]->get_shadow();
-                       part.geom.w = max(part.geom.w, part.graphic[i]->get_width()-shadow.left-shadow.right);
-                       part.geom.h = max(part.geom.h, part.graphic[i]->get_height()-shadow.bottom-shadow.top);
+                       const Graphic &grph = *obj.graphic[i];
+                       const Sides &shadow = grph.get_shadow();
+                       obj.geom.w = max(obj.geom.w, grph.get_width()-shadow.left-shadow.right);
+                       obj.geom.h = max(obj.geom.h, grph.get_height()-shadow.bottom-shadow.top);
                }
 }
 
 void Part::Loader::graphic(State s, const string &n)
 {
-       Graphic *grph = res.get<Graphic>(n);
+       Graphic *grph = get_collection().get<Graphic>(n);
        for(int i=0; i<N_STATES_; ++i)
                if((i&s)==s)
-                       part.graphic[i] = grph;
+                       obj.graphic[i] = grph;
 }
 
 void Part::Loader::align(float x, float y)
 {
-       part.align.x = x;
-       part.align.y = y;
+       obj.align.x = x;
+       obj.align.y = y;
 }
 
 void Part::Loader::fill(float w, float h)
 {
-       part.align.w = w;
-       part.align.h = h;
+       obj.align.w = w;
+       obj.align.h = h;
 }
 
 void Part::Loader::margin()
 {
-       load_sub(part.margin);
+       load_sub(obj.margin);
 }
 
 void Part::Loader::size(unsigned w, unsigned h)
 {
-       part.geom.w = w;
-       part.geom.h = h;
+       obj.geom.w = w;
+       obj.geom.h = h;
 }
 
 } // namespace GLtk