X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fcatalogue.cpp;h=2f932d62f1c6b6133c49958494b6b8e599ed2059;hb=a2d709404d50cb755ef20829241e4ae51301e19a;hp=c02b7e6fddbc3ca64f860333d8fa06047187be51;hpb=f19d6828989582bc53086ce9d8dc35e52c02dc2a;p=r2c2.git

diff --git a/source/3d/catalogue.cpp b/source/3d/catalogue.cpp
index c02b7e6..2f932d6 100644
--- a/source/3d/catalogue.cpp
+++ b/source/3d/catalogue.cpp
@@ -1,9 +1,5 @@
 #include <msp/core/maputils.h>
-#include <msp/fs/stat.h>
 #include <msp/gl/meshbuilder.h>
-#include <msp/gl/object.h>
-#include <msp/gl/program.h>
-#include <msp/gl/technique.h>
 #include "catalogue.h"
 #include "signaltype.h"
 #include "tracktype.h"
@@ -17,11 +13,9 @@ namespace R2C2 {
 Catalogue3D::Catalogue3D(Catalogue &c):
 	catalogue(c)
 {
-	add_type<GL::Material>().creator(&Catalogue3D::create<GL::Material>);
-	add_type<GL::Mesh>().creator(&Catalogue3D::create<GL::Mesh>);
-	add_type<GL::Object>().creator(&Catalogue3D::create2<GL::Object>);
-	add_type<GL::Program>().creator(&Catalogue3D::create<GL::Program>);
-	add_type<GL::Technique>().creator(&Catalogue3D::create2<GL::Technique>);
+	src.add_directory(".");
+	src.add_directory("data");
+	add_source(src);
 
 	catalogue.signal_object_added.connect(sigc::mem_fun(this, &Catalogue3D::object_added));
 
@@ -89,32 +83,4 @@ const GL::Mesh &Catalogue3D::get_endpoint_mesh(const TrackAppearance &appearance
 	return *get_item(endpoint_meshes, &appearance);
 }
 
-FS::Path Catalogue3D::locate_file(const string &name)
-{
-	if(FS::exists(name))
-		return name;
-
-	FS::Path path = FS::Path("data")/name;
-	if(FS::exists(path))
-		return path;
-
-	throw runtime_error("Can't locate "+name);
-}
-
-template<typename T>
-T *Catalogue3D::create(const string &name)
-{
-	RefPtr<T> obj = new T;
-	DataFile::load(*obj, locate_file(name).str());
-	return obj.release();
-}
-
-template<typename T>
-T *Catalogue3D::create2(const string &name)
-{
-	RefPtr<T> obj = new T;
-	DataFile::load(*obj, locate_file(name).str(), *this);
-	return obj.release();
-}
-
 } // namespace R2C2