Derive Resources from DataFile::Collection

[libs/gltk.git] / source / graphic.h

diff --git a/source/graphic.h b/source/graphic.h
index 912786ce380f195fd173460d3406ed8087eec4ee..a9722ad97ff3e498187fffae3ff229a4654e66ae 100644 (file)
--- a/source/graphic.h
+++ b/source/graphic.h
@@ -15,18 +15,22 @@ class Graphic
 public:
        class Loader: public DataFile::Loader
        {
-       public:
-               Loader(Graphic &);
        private:
                Graphic &graph;
+               Resources &res;
+
+       public:
+               typedef Resources Collection;
 
+               Loader(Graphic &, Resources &);
+       private:
                void texture(const std::string &);
                void slice(unsigned, unsigned, unsigned, unsigned);
                void border();
                void shadow();
        };
 
-       Graphic(const Resources &, const std::string &);
+       Graphic();
        const Sides &get_border() const { return border; }
        const Sides &get_shadow() const { return shadow; }
        const GL::Texture2D *get_texture() const { return texture; }
@@ -34,8 +38,6 @@ public:
        unsigned get_height() const { return slice.h; }
        void render(unsigned, unsigned) const;
 private:
-       const Resources &res;
-       std::string name;
        Sides border;
        Sides shadow;
        const GL::Texture2D *texture;