Add vehicles

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

diff --git a/source/3d/catalogue.h b/source/3d/catalogue.h
index 689756d1b59775ad03e757b2b01101311922b4cf..d826a780381990b6a471c0e47f7b56053e062d71 100644 (file)
--- a/source/3d/catalogue.h
+++ b/source/3d/catalogue.h
@@ -9,24 +9,38 @@ Distributed under the GPL
 #define MARKLIN3D_CATALOGUE_H_
 
 #include <msp/gl/material.h>
+#include <msp/gl/mesh.h>
 #include "libmarklin/catalogue.h"
 
 namespace Marklin {
 
 class TrackType3D;
+class VehicleType3D;
 
 class Catalogue3D
 {
 private:
-       const Catalogue &catalogue;
+       Catalogue &catalogue;
        std::map<const TrackType *, TrackType3D *> tracks;
-       Msp::GL::Material *ballast_material;
+       std::map<const VehicleType *, VehicleType3D *> vehicles;
+       Msp::GL::Material ballast_material;
+       Msp::GL::Material rail_material;
+       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 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 loco_added(const LocoType &);
+       void build_endpoint_mesh();
 };
 
 }