Convert Catalogue to a Collection

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

diff --git a/source/3d/catalogue.h b/source/3d/catalogue.h
index ea4182893b36a3b1f3823b36e99f08e66577fbbe..d82529f9fec47e5ebb58a2912941aa8447474a4d 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,40 +12,39 @@ namespace R2C2 {
 
 class ObjectType3D;
 
-class Catalogue3D: public Msp::DataFile::Collection
+class Catalogue3D: public Msp::GL::Resources
 {
 private:
+       typedef std::map<const ObjectType *, ObjectType3D *> ObjectMap;
+       typedef std::map<const TrackAppearance *, Msp::GL::Mesh *> EndpointMap;
+
        Catalogue &catalogue;
-       std::map<const ObjectType *, ObjectType3D *> objects;
-       std::map<const TrackAppearance *, Msp::GL::Mesh *> endpoint_meshes;
+       Msp::DataFile::DirectorySource src;
+       ObjectMap objects;
+       EndpointMap endpoint_meshes;
 
 public:
        Catalogue3D(Catalogue &);
        ~Catalogue3D();
 
        const Catalogue &get_catalogue() const { return catalogue; }
-private:
-       void object_added(const ObjectType &);
-public:
+
+       const ObjectType3D &get_3d(const ObjectType &);
        const ObjectType3D &get_3d(const ObjectType &) const;
 
        template<typename T>
        const typename TypeMap3D<T>::Type3D &get_3d(const T &ot) const
        { return dynamic_cast<const typename TypeMap3D<T>::Type3D &>(get_3d(static_cast<const ObjectType &>(ot))); }
 
+       template<typename T>
+       const typename TypeMap3D<T>::Type3D &get_3d(const T &ot)
+       { return dynamic_cast<const typename TypeMap3D<T>::Type3D &>(get_3d(static_cast<const ObjectType &>(ot))); }
+
 private:
        void build_endpoint_mesh(const TrackAppearance &);
 public:
+       const Msp::GL::Mesh &get_endpoint_mesh(const TrackAppearance &);
        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 &);
 };
 
 }