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

diff --git a/source/3d/catalogue.h b/source/3d/catalogue.h
index 6b819b7..d82529f 100644
--- a/source/3d/catalogue.h
+++ b/source/3d/catalogue.h
@@ -2,44 +2,49 @@
 #define R2C2_3D_CATALOGUE_H_
 
 #include <msp/datafile/collection.h>
-#include <msp/fs/path.h>
-#include <msp/gl/material.h>
+#include <msp/datafile/directorysource.h>
 #include <msp/gl/mesh.h>
+#include <msp/gl/resources.h>
 #include "libr2c2/catalogue.h"
+#include "typemap.h"
 
 namespace R2C2 {
 
-class TrackType3D;
-class VehicleType3D;
+class ObjectType3D;
 
-class Catalogue3D: public Msp::DataFile::Collection
+class Catalogue3D: public Msp::GL::Resources
 {
 private:
+	typedef std::map<const ObjectType *, ObjectType3D *> ObjectMap;
+	typedef std::map<const TrackAppearance *, Msp::GL::Mesh *> EndpointMap;
+
 	Catalogue &catalogue;
-	std::map<const TrackType *, TrackType3D *> tracks;
-	std::map<const VehicleType *, VehicleType3D *> vehicles;
-	Msp::GL::Mesh endpoint_mesh;
+	Msp::DataFile::DirectorySource src;
+	ObjectMap objects;
+	EndpointMap 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();
 
-	Msp::FS::Path locate_file(const std::string &);
+	const ObjectType3D &get_3d(const ObjectType &);
+	const ObjectType3D &get_3d(const ObjectType &) const;
 
 	template<typename T>
-	T *create(const std::string &);
+	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))); }
 
 	template<typename T>
-	T *create2(const std::string &);
+	const typename TypeMap3D<T>::Type3D &get_3d(const T &ot)
+	{ 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 Msp::GL::Mesh &get_endpoint_mesh(const TrackAppearance &) const;
 };
 
 }