X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fcatalogue.h;h=ea4182893b36a3b1f3823b36e99f08e66577fbbe;hb=145ba6391812e2b1040a78a8f0fda5888bfea610;hp=6b819b71b61561c2a2db2589bd74df859934f4e7;hpb=d15ac13f2e170f155b4bbd124df48400c339b644;p=r2c2.git

diff --git a/source/3d/catalogue.h b/source/3d/catalogue.h
index 6b819b7..ea41828 100644
--- a/source/3d/catalogue.h
+++ b/source/3d/catalogue.h
@@ -6,33 +6,39 @@
 #include <msp/gl/material.h>
 #include <msp/gl/mesh.h>
 #include "libr2c2/catalogue.h"
+#include "typemap.h"
 
 namespace R2C2 {
 
-class TrackType3D;
-class VehicleType3D;
+class ObjectType3D;
 
 class Catalogue3D: public Msp::DataFile::Collection
 {
 private:
 	Catalogue &catalogue;
-	std::map<const TrackType *, TrackType3D *> tracks;
-	std::map<const VehicleType *, VehicleType3D *> vehicles;
-	Msp::GL::Mesh endpoint_mesh;
+	std::map<const ObjectType *, ObjectType3D *> objects;
+	std::map<const TrackAppearance *, Msp::GL::Mesh *> endpoint_meshes;
 
 public:
 	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::Mesh &get_endpoint_mesh() const { return endpoint_mesh; }
 private:
-	void track_added(const TrackType &);
-	void vehicle_added(const VehicleType &);
-	void build_endpoint_mesh();
+	void object_added(const ObjectType &);
+public:
+	const ObjectType3D &get_3d(const ObjectType &) const;
+
+	template<typename T>
+	const typename TypeMap3D<T>::Type3D &get_3d(const T &ot) const
+	{ return dynamic_cast<const typename TypeMap3D<T>::Type3D &>(get_3d(static_cast<const ObjectType &>(ot))); }
 
+private:
+	void build_endpoint_mesh(const TrackAppearance &);
+public:
+	const Msp::GL::Mesh &get_endpoint_mesh(const TrackAppearance &) const;
+
+private:
 	Msp::FS::Path locate_file(const std::string &);
 
 	template<typename T>