Rename the project to R²C²

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

diff --git a/source/3d/catalogue.h b/source/3d/catalogue.h
index 6cc5bede4fcdc27f2faa845c1e96d723888f9eb0..bda1314ce6528a8f4721ca1ed2e9933c1bdbe0b4 100644 (file)
--- a/source/3d/catalogue.h
+++ b/source/3d/catalogue.h
@@ -1,26 +1,28 @@
 /* $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/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
 {
 private:
        Catalogue &catalogue;
        std::map<const TrackType *, TrackType3D *> tracks;
+       std::map<const VehicleType *, VehicleType3D *> vehicles;
        Msp::GL::Material ballast_material;
        Msp::GL::Material rail_material;
        Msp::GL::Mesh endpoint_mesh;
@@ -31,11 +33,13 @@ public:
 
        const Catalogue &get_catalogue() const { return catalogue; }
        const TrackType3D &get_track(const TrackType &) const;
+       const VehicleType3D &get_vehicle(const VehicleType &) const;
        const Msp::GL::Material &get_ballast_material() const { return ballast_material; }
        const Msp::GL::Material &get_rail_material() const { return rail_material; }
        const Msp::GL::Mesh &get_endpoint_mesh() const { return endpoint_mesh; }
 private:
        void track_added(const TrackType &);
+       void vehicle_added(const VehicleType &);
        void build_endpoint_mesh();
 };