Add functions to resolve an arbitrary point to the nearest point on a track

[r2c2.git] / source / 3d / catalogue.cpp

diff --git a/source/3d/catalogue.cpp b/source/3d/catalogue.cpp
index 8d31219eb24dfabc1c718457be7db9fda7c5ac76..935219ed75e268347ea654e20d9aa6f56e7215e3 100644 (file)
--- 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));
@@ -94,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>