X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fcatalogue.cpp;h=9daa7c809c7421dc71b9a68e2e044107358d7750;hb=b28062f2dc88e082ee5a28b2e1f7c4c8bd989023;hp=f4e4fd04a4a4eb0b4736cb6ff3d355a7bb7a6dec;hpb=d15ac13f2e170f155b4bbd124df48400c339b644;p=r2c2.git

diff --git a/source/3d/catalogue.cpp b/source/3d/catalogue.cpp
index f4e4fd0..9daa7c8 100644
--- a/source/3d/catalogue.cpp
+++ b/source/3d/catalogue.cpp
@@ -4,6 +4,7 @@
 #include <msp/gl/program.h>
 #include <msp/gl/technique.h>
 #include "catalogue.h"
+#include "signaltype.h"
 #include "tracktype.h"
 #include "vehicletype.h"
 
@@ -16,56 +17,40 @@ Catalogue3D::Catalogue3D(Catalogue &c):
 	catalogue(c),
 	endpoint_mesh((GL::NORMAL3, GL::VERTEX3))
 {
-	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>);
+	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_track_added.connect(sigc::mem_fun(this, &Catalogue3D::track_added));
-	catalogue.signal_vehicle_added.connect(sigc::mem_fun(this, &Catalogue3D::vehicle_added));
+	catalogue.signal_object_added.connect(sigc::mem_fun(this, &Catalogue3D::object_added));
 
-	const Catalogue::TrackMap &trks = catalogue.get_tracks();
-	for(Catalogue::TrackMap::const_iterator i=trks.begin(); i!=trks.end(); ++i)
-		track_added(*i->second);
+	const Catalogue::ObjectMap &objs = catalogue.get_all();
+	for(Catalogue::ObjectMap::const_iterator i=objs.begin(); i!=objs.end(); ++i)
+		object_added(*i->second);
 
 	build_endpoint_mesh();
 }
 
 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
-{
-	map<const TrackType *, TrackType3D *>::const_iterator i = tracks.find(&tt);
-	if(i==tracks.end())
-		throw KeyError("Unknown track type");
-
-	return *i->second;
-}
-
-const VehicleType3D &Catalogue3D::get_vehicle(const VehicleType &vt) const
-{
-	map<const VehicleType *, VehicleType3D *>::const_iterator i = vehicles.find(&vt);
-	if(i==vehicles.end())
-		throw KeyError("Unknown vehicle type");
-
-	return *i->second;
 }
 
-void Catalogue3D::track_added(const TrackType &track)
+void Catalogue3D::object_added(const ObjectType &ot)
 {
-	tracks[&track] = new TrackType3D(*this, track);
+	if(const TrackType *tt = dynamic_cast<const TrackType *>(&ot))
+		objects[&ot] = new TrackType3D(*this, *tt);
+	else if(const SignalType *st = dynamic_cast<const SignalType *>(&ot))
+		objects[&ot] = new SignalType3D(*this, *st);
+	else if(const VehicleType *vt = dynamic_cast<const VehicleType *>(&ot))
+		objects[&ot] = new VehicleType3D(*this, *vt);
 }
 
-void Catalogue3D::vehicle_added(const VehicleType &veh)
+const ObjectType3D &Catalogue3D::get_3d(const ObjectType &ot) const
 {
-	vehicles[&veh] = new VehicleType3D(*this, veh);
+	return *get_item(objects, &ot);
 }
 
 void Catalogue3D::build_endpoint_mesh()
@@ -102,7 +87,7 @@ FS::Path Catalogue3D::locate_file(const string &name)
 	if(FS::exists(path))
 		return path;
 
-	throw Exception("Can't locate "+name);
+	throw runtime_error("Can't locate "+name);
 }
 
 template<typename T>