X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fcatalogue.h;h=1f33ebb808e7aec3a7af34bc042dd757ec118431;hb=e392d397f6b86a49a05e9738357ccbfc2a922f01;hp=689756d1b59775ad03e757b2b01101311922b4cf;hpb=7e382cc3cad8c4f6945b0c9d89e2ca917b42b740;p=r2c2.git

diff --git a/source/3d/catalogue.h b/source/3d/catalogue.h
index 689756d..1f33ebb 100644
--- 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 vehicle_added(const VehicleType &);
+	void build_endpoint_mesh();
 };
 
 }