X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fcatalogue.cpp;h=0c7a606a28341ba86584ba015c97597fe75a28ac;hb=6aa6e3a60c31d71e8f8117be1ddf547897d19bd8;hp=8d31219eb24dfabc1c718457be7db9fda7c5ac76;hpb=4236c30c0a7a48854e9634e9ad7d8d6e0fd243a3;p=r2c2.git

diff --git a/source/3d/catalogue.cpp b/source/3d/catalogue.cpp
index 8d31219..0c7a606 100644
--- a/source/3d/catalogue.cpp
+++ b/source/3d/catalogue.cpp
@@ -1,9 +1,8 @@
-#include <msp/fs/stat.h>
+#include <msp/core/maputils.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"
 #include "vehicletype.h"
 
@@ -13,69 +12,68 @@ using namespace Msp;
 namespace R2C2 {
 
 Catalogue3D::Catalogue3D(Catalogue &c):
-	catalogue(c),
-	endpoint_mesh((GL::NORMAL3, GL::VERTEX3))
+	catalogue(c)
 {
-	add_creator<GL::Material>(&Catalogue3D::create<GL::Material>);
-	add_creator<GL::Mesh>(&Catalogue3D::create<GL::Mesh>);
-	add_creator<GL::Object>(&Catalogue3D::create2<GL::Object>);
-	add_creator<GL::Program>(&Catalogue3D::create<GL::Program>);
-	add_creator<GL::Technique>(&Catalogue3D::create2<GL::Technique>);
+	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));
 
-	catalogue.signal_track_added.connect(sigc::mem_fun(this, &Catalogue3D::track_added));
-	catalogue.signal_vehicle_added.connect(sigc::mem_fun(this, &Catalogue3D::vehicle_added));
-
-	const Catalogue::TrackMap &trks = catalogue.get_tracks();
-	for(Catalogue::TrackMap::const_iterator i=trks.begin(); i!=trks.end(); ++i)
-		track_added(*i->second);
-
-	build_endpoint_mesh();
+	set_srgb_conversion(true);
 }
 
 Catalogue3D::~Catalogue3D()
 {
-	for(map<const TrackType *, TrackType3D *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+	for(map<const ObjectType *, ObjectType3D *>::iterator i=objects.begin(); i!=objects.end(); ++i)
 		delete i->second;
-	for(map<const VehicleType *, VehicleType3D *>::iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
-		delete i->second;
-}
-
-const TrackType3D &Catalogue3D::get_track(const TrackType &tt) const
-{
-	return *get_item(tracks, &tt);
 }
 
-const VehicleType3D &Catalogue3D::get_vehicle(const VehicleType &vt) const
+const ObjectType3D &Catalogue3D::get_3d(const ObjectType &ot)
 {
-	return *get_item(vehicles, &vt);
+	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))
+		ot3d = new TrackType3D(*this, *tt);
+	else if(const SignalType *st = dynamic_cast<const SignalType *>(&ot))
+		ot3d = new SignalType3D(*this, *st);
+	else if(const VehicleType *vt = dynamic_cast<const VehicleType *>(&ot))
+		ot3d = new VehicleType3D(*this, *vt);
+	else
+		throw key_error(&ot);
+
+	objects[&ot] = ot3d;
+	return *ot3d;
 }
 
-void Catalogue3D::track_added(const TrackType &track)
+const ObjectType3D &Catalogue3D::get_3d(const ObjectType &ot) const
 {
-	tracks[&track] = new TrackType3D(*this, track);
+	return *get_item(objects, &ot);
 }
 
-void Catalogue3D::vehicle_added(const VehicleType &veh)
+const GL::Mesh &Catalogue3D::get_endpoint_mesh(const TrackAppearance &appearance)
 {
-	vehicles[&veh] = new VehicleType3D(*this, veh);
-}
+	EndpointMap::iterator i = endpoint_meshes.find(&appearance);
+	if(i!=endpoint_meshes.end())
+		return *i->second;
 
-void Catalogue3D::build_endpoint_mesh()
-{
-	const Profile &ballast_profile = catalogue.get_ballast_profile();
+	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();
 
-	const Profile &rail_profile = catalogue.get_rail_profile();
+	const Profile &rail_profile = appearance.get_rail_profile();
 	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;
 
-	GL::MeshBuilder bld(endpoint_mesh);
+	GL::Mesh *mesh = new GL::Mesh((GL::NORMAL3, GL::VERTEX3));
+	GL::MeshBuilder bld(*mesh);
 	bld.normal(1, 0, 0);
 	bld.begin(GL::QUADS);
 	bld.vertex(0, width/2, 0);
@@ -83,34 +81,14 @@ void Catalogue3D::build_endpoint_mesh()
 	bld.vertex(0, -width/2, height);
 	bld.vertex(0, -width/2, 0);
 	bld.end();
-}
-
-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 Exception("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();
+	endpoint_meshes[&appearance] = mesh;
+	return *mesh;
 }
 
-template<typename T>
-T *Catalogue3D::create2(const string &name)
+const GL::Mesh &Catalogue3D::get_endpoint_mesh(const TrackAppearance &appearance) const
 {
-	RefPtr<T> obj = new T;
-	DataFile::load(*obj, locate_file(name).str(), *this);
-	return obj.release();
+	return *get_item(endpoint_meshes, &appearance);
 }
 
 } // namespace R2C2