Derive Collection3D from Msp::DataFile and get GL::Objects through it

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

diff --git a/source/3d/catalogue.h b/source/3d/catalogue.h
index 1f33ebb808e7aec3a7af34bc042dd757ec118431..caf104e5ef146bcb9ec844dd963037bf41294ab7 100644 (file)
--- a/source/3d/catalogue.h
+++ b/source/3d/catalogue.h
@@ -1,23 +1,25 @@
 /* $Id$
 
-This file is part of the MSP Märklin suite
+This file is part of R²C²
 Copyright © 2010 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
-#ifndef MARKLIN3D_CATALOGUE_H_
-#define MARKLIN3D_CATALOGUE_H_
+#ifndef R2C2_3D_CATALOGUE_H_
+#define R2C2_3D_CATALOGUE_H_
 
+#include <msp/datafile/collection.h>
+#include <msp/fs/path.h>
 #include <msp/gl/material.h>
 #include <msp/gl/mesh.h>
-#include "libmarklin/catalogue.h"
+#include "libr2c2/catalogue.h"
 
-namespace Marklin {
+namespace R2C2 {
 
 class TrackType3D;
 class VehicleType3D;
 
-class Catalogue3D
+class Catalogue3D: public Msp::DataFile::Collection
 {
 private:
        Catalogue &catalogue;
@@ -41,6 +43,14 @@ private:
        void track_added(const TrackType &);
        void vehicle_added(const VehicleType &);
        void build_endpoint_mesh();
+
+       Msp::FS::Path locate_file(const std::string &);
+
+       template<typename T>
+       T *create(const std::string &);
+
+       template<typename T>
+       T *create2(const std::string &);
 };
 
 }