Inherit Loaders from the ObjectLoader classes

[libs/gl.git] / source / object.h

diff --git a/source/object.h b/source/object.h
index fff1e4cf281d770adf207fada79e156ca016b6e6..bf4a05249436f5453ec678a274431958597a61fb 100644 (file)
--- a/source/object.h
+++ b/source/object.h
@@ -9,7 +9,6 @@ Distributed under the LGPL
 #define MSP_GL_OBJECT_H_
 
 #include <vector>
-#include <msp/datafile/collection.h>
 #include "objectpass.h"
 #include "renderable.h"
 
@@ -41,20 +40,11 @@ private:
        const Material *material;
 
 public:
-       class Loader: public DataFile::Loader
+       class Loader: public DataFile::CollectionObjectLoader<Object>
        {
-       public:
-               typedef DataFile::Collection Collection;
-
-       protected:
-               Object &obj;
-               Collection &coll;
-       
        public:
                Loader(Object &, Collection &);
 
-               Object &get_object() const { return obj; }
-               Collection &get_collection() const { return coll; }
        private:
                virtual void finish();
                void lod_mesh(unsigned, const std::string &);