X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fcatalogue.cpp;h=4d7b4a83fea5f3835221198004c6b28dd9c80e37;hb=e621dd4120cb253417167b4295e436cee095ccb0;hp=6cb7558157eb4c3339354b162d4b4fc8e14a92a7;hpb=754ac497179474d0266b55e881a084fef7d5d6a1;p=r2c2.git

diff --git a/source/3d/catalogue.cpp b/source/3d/catalogue.cpp
index 6cb7558..4d7b4a8 100644
--- a/source/3d/catalogue.cpp
+++ b/source/3d/catalogue.cpp
@@ -1,16 +1,10 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2010-2011  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #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 "catalogue.h"
+#include "signaltype.h"
 #include "tracktype.h"
 #include "vehicletype.h"
 
@@ -23,18 +17,22 @@ 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_signal_added.connect(sigc::mem_fun(this, &Catalogue3D::signal_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::SignalMap &sigs = catalogue.get_signals();
+	for(Catalogue::SignalMap::const_iterator i=sigs.begin(); i!=sigs.end(); ++i)
+		signal_added(*i->second);
 
 	build_endpoint_mesh();
 }
@@ -45,24 +43,23 @@ Catalogue3D::~Catalogue3D()
 		delete i->second;
 	for(map<const VehicleType *, VehicleType3D *>::iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
 		delete i->second;
+	for(map<const SignalType *, SignalType3D *>::iterator i=signals.begin(); i!=signals.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;
+	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 *get_item(vehicles, &vt);
+}
 
-	return *i->second;
+const SignalType3D &Catalogue3D::get_signal(const SignalType &vt) const
+{
+	return *get_item(signals, &vt);
 }
 
 void Catalogue3D::track_added(const TrackType &track)
@@ -75,15 +72,20 @@ void Catalogue3D::vehicle_added(const VehicleType &veh)
 	vehicles[&veh] = new VehicleType3D(*this, veh);
 }
 
+void Catalogue3D::signal_added(const SignalType &sig)
+{
+	signals[&sig] = new SignalType3D(*this, sig);
+}
+
 void Catalogue3D::build_endpoint_mesh()
 {
 	const Profile &ballast_profile = catalogue.get_ballast_profile();
-	const Point &ballast_min = ballast_profile.get_min_coords();
-	const Point &ballast_max = ballast_profile.get_max_coords();
+	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 Point &rail_min = rail_profile.get_min_coords();
-	const Point &rail_max = rail_profile.get_max_coords();
+	const Vector &rail_min = rail_profile.get_min_coords();
+	const Vector &rail_max = rail_profile.get_max_coords();
 
 	float gauge = catalogue.get_gauge();
 
@@ -109,7 +111,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>