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

diff --git a/source/3d/catalogue.cpp b/source/3d/catalogue.cpp
index f4e4fd0..935219e 100644
--- a/source/3d/catalogue.cpp
+++ b/source/3d/catalogue.cpp
@@ -16,11 +16,11 @@ 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));
@@ -42,20 +42,12 @@ Catalogue3D::~Catalogue3D()
 
 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;
+	return *get_item(tracks, &tt);
 }
 
 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;
+	return *get_item(vehicles, &vt);
 }
 
 void Catalogue3D::track_added(const TrackType &track)
@@ -102,7 +94,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>