Convert Catalogue to a Collection

[r2c2.git] / source / 3d / catalogue.cpp

diff --git a/source/3d/catalogue.cpp b/source/3d/catalogue.cpp
index d84e2d0d5b1535709c2b924d028f0897fcaf75b4..f06356b367bd3ff8c5686465d33c9b751274923e 100644 (file)
--- a/source/3d/catalogue.cpp
+++ b/source/3d/catalogue.cpp
@@ -16,12 +16,6 @@ Catalogue3D::Catalogue3D(Catalogue &c):
        src.add_directory(".");
        src.add_directory("data");
        add_source(src);
-
-       catalogue.signal_object_added.connect(sigc::mem_fun(this, &Catalogue3D::object_added));
-
-       const Catalogue::ObjectMap &objs = catalogue.get_all();
-       for(Catalogue::ObjectMap::const_iterator i=objs.begin(); i!=objs.end(); ++i)
-               object_added(*i->second);
 }
 
 Catalogue3D::~Catalogue3D()
@@ -30,19 +24,24 @@ Catalogue3D::~Catalogue3D()
                delete i->second;
 }
 
-void Catalogue3D::object_added(const ObjectType &ot)
+const ObjectType3D &Catalogue3D::get_3d(const ObjectType &ot)
 {
+       ObjectMap::iterator i = objects.find(&ot);
+       if(i!=objects.end())
+               return *i->second;
+
+       ObjectType3D *ot3d = 0;
        if(const TrackType *tt = dynamic_cast<const TrackType *>(&ot))
-       {
-               objects[&ot] = new TrackType3D(*this, *tt);
-               const TrackAppearance &appearance = tt->get_appearance();
-               if(!endpoint_meshes.count(&appearance))
-                       build_endpoint_mesh(appearance);
-       }
+               ot3d = new TrackType3D(*this, *tt);
        else if(const SignalType *st = dynamic_cast<const SignalType *>(&ot))
-               objects[&ot] = new SignalType3D(*this, *st);
+               ot3d = new SignalType3D(*this, *st);
        else if(const VehicleType *vt = dynamic_cast<const VehicleType *>(&ot))
-               objects[&ot] = new VehicleType3D(*this, *vt);
+               ot3d = new VehicleType3D(*this, *vt);
+       else
+               throw key_error(&ot);
+
+       objects[&ot] = ot3d;
+       return *ot3d;
 }
 
 const ObjectType3D &Catalogue3D::get_3d(const ObjectType &ot) const
@@ -50,8 +49,12 @@ const ObjectType3D &Catalogue3D::get_3d(const ObjectType &ot) const
        return *get_item(objects, &ot);
 }
 
-void Catalogue3D::build_endpoint_mesh(const TrackAppearance &appearance)
+const GL::Mesh &Catalogue3D::get_endpoint_mesh(const TrackAppearance &appearance)
 {
+       EndpointMap::iterator i = endpoint_meshes.find(&appearance);
+       if(i!=endpoint_meshes.end())
+               return *i->second;
+
        const Profile &ballast_profile = appearance.get_ballast_profile();
        const Vector &ballast_min = ballast_profile.get_min_coords();
        const Vector &ballast_max = ballast_profile.get_max_coords();
@@ -76,6 +79,7 @@ void Catalogue3D::build_endpoint_mesh(const TrackAppearance &appearance)
        bld.end();
 
        endpoint_meshes[&appearance] = mesh;
+       return *mesh;
 }
 
 const GL::Mesh &Catalogue3D::get_endpoint_mesh(const TrackAppearance &appearance) const