X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fcatalogue.cpp;h=d84e2d0d5b1535709c2b924d028f0897fcaf75b4;hb=5929b101ee38b5668b328e7b1eac4bf49c912412;hp=e28237f9fb37e27ec2b326ff6fe7b2f492b4d2ca;hpb=d405b9943c888e3945c7ea4e496f9d300b114fe0;p=r2c2.git

diff --git a/source/3d/catalogue.cpp b/source/3d/catalogue.cpp
index e28237f..d84e2d0 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::create<GL::Object>);
-	add_type<GL::Program>().creator(&Catalogue3D::create<GL::Program>);
-	add_type<GL::Technique>().creator(&Catalogue3D::create<GL::Technique>);
+	src.add_directory(".");
+	src.add_directory("data");
+	add_source(src);
 
 	catalogue.signal_object_added.connect(sigc::mem_fun(this, &Catalogue3D::object_added));
 
@@ -66,7 +60,7 @@ void Catalogue3D::build_endpoint_mesh(const TrackAppearance &appearance)
 	const Vector &rail_min = rail_profile.get_min_coords();
 	const Vector &rail_max = rail_profile.get_max_coords();
 
-	float gauge = catalogue.get_gauge();
+	float gauge = appearance.get_gauge();
 
 	float width = max(max(-ballast_min.x, ballast_max.x)*2, gauge+(rail_max.x-rail_min.x)*2)+0.004;
 	float height = ballast_max.y-ballast_min.y+rail_max.y-rail_min.y+0.01;
@@ -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