- const map<unsigned, TrackType *> &trks = catalogue.get_tracks();
- for(map<unsigned, TrackType *>::const_iterator i=trks.begin(); i!=trks.end(); ++i)
- tracks[i->second] = new TrackType3D(*this, *i->second);
+ 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()
+{
+ for(map<const ObjectType *, ObjectType3D *>::iterator i=objects.begin(); i!=objects.end(); ++i)
+ delete i->second;
+}
+
+void Catalogue3D::object_added(const ObjectType &ot)
+{
+ 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);
+ }
+ else if(const SignalType *st = dynamic_cast<const SignalType *>(&ot))
+ objects[&ot] = new SignalType3D(*this, *st);
+ else if(const VehicleType *vt = dynamic_cast<const VehicleType *>(&ot))
+ objects[&ot] = new VehicleType3D(*this, *vt);