X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fcatalogue.h;h=586ee66758f617778af53d6a489b0c0bd1bd69bc;hb=d06a1e1ab34e5ecb4bb7011d44298a0b5e6162be;hp=07f1535f2b30583d72ce554124cb4a9195ad5d09;hpb=a2d709404d50cb755ef20829241e4ae51301e19a;p=r2c2.git

diff --git a/source/3d/catalogue.h b/source/3d/catalogue.h
index 07f1535..586ee66 100644
--- a/source/3d/catalogue.h
+++ b/source/3d/catalogue.h
@@ -15,28 +15,34 @@ class ObjectType3D;
 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;
-	Msp::DataFile::DirectorySource src;
-	std::map<const ObjectType *, ObjectType3D *> objects;
-	std::map<const TrackAppearance *, Msp::GL::Mesh *> endpoint_meshes;
+	ObjectMap objects;
+	EndpointMap endpoint_meshes;
 
 public:
 	Catalogue3D(Catalogue &);
 	~Catalogue3D();
 
 	const Catalogue &get_catalogue() const { return catalogue; }
-private:
-	void object_added(const ObjectType &);
-public:
+
+	const ObjectType3D &get_3d(const ObjectType &);
 	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))); }
 
+	template<typename T>
+	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;
 };