Use GL::Resources and DirectorySource in Catalogue3D

[r2c2.git] / source / 3d / catalogue.h

diff --git a/source/3d/catalogue.h b/source/3d/catalogue.h
index ea4182893b36a3b1f3823b36e99f08e66577fbbe..07f1535f2b30583d72ce554124cb4a9195ad5d09 100644 (file)
--- a/source/3d/catalogue.h
+++ b/source/3d/catalogue.h
@@ -2,9 +2,9 @@
 #define R2C2_3D_CATALOGUE_H_
 
 #include <msp/datafile/collection.h>
-#include <msp/fs/path.h>
-#include <msp/gl/material.h>
+#include <msp/datafile/directorysource.h>
 #include <msp/gl/mesh.h>
+#include <msp/gl/resources.h>
 #include "libr2c2/catalogue.h"
 #include "typemap.h"
 
@@ -12,10 +12,11 @@ namespace R2C2 {
 
 class ObjectType3D;
 
-class Catalogue3D: public Msp::DataFile::Collection
+class Catalogue3D: public Msp::GL::Resources
 {
 private:
        Catalogue &catalogue;
+       Msp::DataFile::DirectorySource src;
        std::map<const ObjectType *, ObjectType3D *> objects;
        std::map<const TrackAppearance *, Msp::GL::Mesh *> endpoint_meshes;
 
@@ -37,15 +38,6 @@ private:
        void build_endpoint_mesh(const TrackAppearance &);
 public:
        const Msp::GL::Mesh &get_endpoint_mesh(const TrackAppearance &) const;
-
-private:
-       Msp::FS::Path locate_file(const std::string &);
-
-       template<typename T>
-       T *create(const std::string &);
-
-       template<typename T>
-       T *create2(const std::string &);
 };
 
 }