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

diff --git a/source/3d/catalogue.cpp b/source/3d/catalogue.cpp
index e28237f..fb4c397 100644
--- a/source/3d/catalogue.cpp
+++ b/source/3d/catalogue.cpp
@@ -1,9 +1,6 @@
 #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 "libr2c2/trackappearance.h"
 #include "catalogue.h"
 #include "signaltype.h"
 #include "tracktype.h"
@@ -17,17 +14,10 @@ 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>);
-
-	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);
+	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));
 }
 
 Catalogue3D::~Catalogue3D()
@@ -36,19 +26,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
@@ -56,8 +51,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();
@@ -66,7 +65,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;
@@ -82,6 +81,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
@@ -89,32 +89,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