X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fcatalogue.h;h=1cc096a67b9588ca3dbffb5867f43bc0129695aa;hb=7c98e23312cf01ce1fa6c1ffd8e36c22d2fa6110;hp=ecac7ddca27b97ca05ac3a71c8c37fecdb0fd56f;hpb=3e3675f8d86b06cdea7df197dfe8866ffb285aec;p=r2c2.git

diff --git a/source/3d/catalogue.h b/source/3d/catalogue.h
index ecac7dd..1cc096a 100644
--- a/source/3d/catalogue.h
+++ b/source/3d/catalogue.h
@@ -6,20 +6,17 @@
 #include <msp/gl/material.h>
 #include <msp/gl/mesh.h>
 #include "libr2c2/catalogue.h"
+#include "typemap.h"
 
 namespace R2C2 {
 
-class SignalType3D;
-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;
-	std::map<const SignalType *, SignalType3D *> signals;
+	std::map<const ObjectType *, ObjectType3D *> objects;
 	Msp::GL::Mesh endpoint_mesh;
 
 public:
@@ -27,16 +24,21 @@ public:
 	~Catalogue3D();
 
 	const Catalogue &get_catalogue() const { return catalogue; }
-	const TrackType3D &get_track(const TrackType &) const;
-	const VehicleType3D &get_vehicle(const VehicleType &) const;
-	const SignalType3D &get_signal(const SignalType &) const;
-	const Msp::GL::Mesh &get_endpoint_mesh() const { return endpoint_mesh; }
 private:
-	void track_added(const TrackType &);
-	void vehicle_added(const VehicleType &);
-	void signal_added(const SignalType &);
+	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();
+public:
+	const Msp::GL::Mesh &get_endpoint_mesh() const { return endpoint_mesh; }
 
+private:
 	Msp::FS::Path locate_file(const std::string &);
 
 	template<typename T>