/* $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
*/
#include <msp/gl/meshbuilder.h>
-#include "libmarklin/locotype.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_loco_added.connect(sigc::mem_fun(this, &Catalogue3D::loco_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));
{
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
tracks[&track] = new TrackType3D(*this, track);
}
-void Catalogue3D::loco_added(const LocoType &loco)
+void Catalogue3D::vehicle_added(const VehicleType &veh)
{
- vehicles[&loco] = new VehicleType3D(*this, loco);
+ vehicles[&veh] = new VehicleType3D(*this, veh);
}
void Catalogue3D::build_endpoint_mesh()
bld.end();
}
-} // namespace Marklin
+} // namespace R2C2