X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fcatalogue.cpp;h=0c7a606a28341ba86584ba015c97597fe75a28ac;hb=9f0d428e974defa64cdf8e7b7072967327250958;hp=f06356b367bd3ff8c5686465d33c9b751274923e;hpb=81ee4fbd16b472892b67b35ea85956423a2247ed;p=r2c2.git

diff --git a/source/3d/catalogue.cpp b/source/3d/catalogue.cpp
index f06356b..0c7a606 100644
--- a/source/3d/catalogue.cpp
+++ b/source/3d/catalogue.cpp
@@ -1,5 +1,6 @@
 #include <msp/core/maputils.h>
 #include <msp/gl/meshbuilder.h>
+#include "libr2c2/trackappearance.h"
 #include "catalogue.h"
 #include "signaltype.h"
 #include "tracktype.h"
@@ -13,9 +14,12 @@ namespace R2C2 {
 Catalogue3D::Catalogue3D(Catalogue &c):
 	catalogue(c)
 {
-	src.add_directory(".");
-	src.add_directory("data");
-	add_source(src);
+	const list<DataFile::CollectionSource *> &src = catalogue.get_sources();
+	for(list<DataFile::CollectionSource *>::const_iterator i=src.begin(); i!=src.end(); ++i)
+		add_source(**i);
+	catalogue.signal_source_added.connect(sigc::mem_fun(static_cast<DataFile::Collection *>(this), &Catalogue3D::add_source));
+
+	set_srgb_conversion(true);
 }
 
 Catalogue3D::~Catalogue3D()