Add basic support for signals

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

diff --git a/source/3d/catalogue.h b/source/3d/catalogue.h
index b27683c18a820fd3a7b5dcc05b0fc50194b5d04a..ecac7ddca27b97ca05ac3a71c8c37fecdb0fd56f 100644 (file)
--- a/source/3d/catalogue.h
+++ b/source/3d/catalogue.h
@@ -1,40 +1,49 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-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 SignalType3D;
 class TrackType3D;
+class VehicleType3D;
 
-class Catalogue3D
+class Catalogue3D: public Msp::DataFile::Collection
 {
 private:
-       const Catalogue &catalogue;
+       Catalogue &catalogue;
        std::map<const TrackType *, TrackType3D *> tracks;
-       Msp::GL::Material ballast_material;
-       Msp::GL::Material rail_material;
+       std::map<const VehicleType *, VehicleType3D *> vehicles;
+       std::map<const SignalType *, SignalType3D *> signals;
        Msp::GL::Mesh endpoint_mesh;
 
 public:
-       Catalogue3D(const Catalogue &);
+       Catalogue3D(Catalogue &);
+       ~Catalogue3D();
 
        const Catalogue &get_catalogue() const { return catalogue; }
        const TrackType3D &get_track(const TrackType &) const;
-       const Msp::GL::Material &get_ballast_material() const { return ballast_material; }
-       const Msp::GL::Material &get_rail_material() const { return rail_material; }
+       const VehicleType3D &get_vehicle(const VehicleType &) const;
+       const SignalType3D &get_signal(const SignalType &) const;
        const Msp::GL::Mesh &get_endpoint_mesh() const { return endpoint_mesh; }
 private:
+       void track_added(const TrackType &);
+       void vehicle_added(const VehicleType &);
+       void signal_added(const SignalType &);
        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 &);
 };
 
 }