X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fcatalogue.cpp;h=8641013fe3559256a052644267aaf77d7e0869b7;hb=1ff06c5bc46a677fa389ef86c6b26664368f1653;hp=54341c10c0432e7344d30d35cda86cf3724b2596;hpb=48dff17ed3144d944965e7cb534e1f8fb92bd620;p=r2c2.git

diff --git a/source/3d/catalogue.cpp b/source/3d/catalogue.cpp
index 54341c1..8641013 100644
--- a/source/3d/catalogue.cpp
+++ b/source/3d/catalogue.cpp
@@ -1,6 +1,6 @@
 /* $Id$
 
-This file is part of the MSP Märklin suite
+This file is part of R²C²
 Copyright © 2010 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
@@ -8,20 +8,22 @@ Distributed under the GPL
 #include <msp/gl/meshbuilder.h>
 #include "catalogue.h"
 #include "tracktype.h"
+#include "vehicletype.h"
 
 using namespace std;
 using namespace Msp;
 
-namespace Marklin {
+namespace R2C2 {
 
 Catalogue3D::Catalogue3D(Catalogue &c):
 	catalogue(c),
 	endpoint_mesh((GL::NORMAL3, GL::VERTEX3))
 {
 	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 map<unsigned, TrackType *> &trks = catalogue.get_tracks();
-	for(map<unsigned, TrackType *>::const_iterator i=trks.begin(); i!=trks.end(); ++i)
+	const Catalogue::TrackMap &trks = catalogue.get_tracks();
+	for(Catalogue::TrackMap::const_iterator i=trks.begin(); i!=trks.end(); ++i)
 		track_added(*i->second);
 
 	ballast_material.set_diffuse(GL::Color(0.25, 0.25, 0.25));
@@ -34,6 +36,8 @@ Catalogue3D::~Catalogue3D()
 {
 	for(map<const TrackType *, TrackType3D *>::iterator i=tracks.begin(); i!=tracks.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
@@ -45,11 +49,25 @@ const TrackType3D &Catalogue3D::get_track(const TrackType &tt) const
 	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)
 {
 	tracks[&track] = new TrackType3D(*this, track);
 }
 
+void Catalogue3D::vehicle_added(const VehicleType &veh)
+{
+	vehicles[&veh] = new VehicleType3D(*this, veh);
+}
+
 void Catalogue3D::build_endpoint_mesh()
 {
 	const Profile &ballast_profile = catalogue.get_ballast_profile();
@@ -75,4 +93,4 @@ void Catalogue3D::build_endpoint_mesh()
 	bld.end();
 }
 
-} // namespace Marklin
+} // namespace R2C2