X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fcatalogue.h;h=d826a780381990b6a471c0e47f7b56053e062d71;hb=e5cd9e4fbc577036a0385c985b6b65df8218d0a2;hp=ccbf5887c454c7e2c46701a9947d1fbd3cfa285d;hpb=02c9a9779954d993cb73fe5f7a72b0847e87f633;p=r2c2.git diff --git a/source/3d/catalogue.h b/source/3d/catalogue.h index ccbf588..d826a78 100644 --- a/source/3d/catalogue.h +++ b/source/3d/catalogue.h @@ -15,26 +15,31 @@ Distributed under the GPL namespace Marklin { class TrackType3D; +class VehicleType3D; class Catalogue3D { private: - const Catalogue &catalogue; + Catalogue &catalogue; std::map tracks; + std::map 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(); };