#include <msp/gl/texture.h>
#include <msp/datafile/parser.h>
#include "layout.h"
+#include "track.h"
+#include "vehicle.h"
using namespace std;
using namespace Msp;
{
layout.signal_track_added.connect(sigc::mem_fun(this, &Layout3D::track_added));
layout.signal_track_removed.connect(sigc::mem_fun(this, &Layout3D::track_removed));
+ layout.signal_vehicle_added.connect(sigc::mem_fun(this, &Layout3D::vehicle_added));
const set<Track *> <racks = layout.get_tracks();
for(set<Track *>::iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
Layout3D::~Layout3D()
{
while(!tracks.empty())
- delete tracks.front();
+ delete tracks.begin()->second;
+ while(!vehicles.empty())
+ delete vehicles.begin()->second;
}
void Layout3D::add_track(Track3D &t)
{
- tracks.push_back(&t);
+ if(tracks.count(&t.get_track()))
+ throw KeyError("Duplicate track");
+
+ tracks[&t.get_track()] = &t;
}
void Layout3D::remove_track(Track3D &t)
{
- list<Track3D *>::iterator i = find(tracks.begin(), tracks.end(), &t);
- if(i!=tracks.end())
- tracks.erase(i);
+ tracks.erase(&t.get_track());
}
-Track3D &Layout3D::get_track(const Track &t) const
+Track3D &Layout3D::get_track(Track &t) const
{
- for(list<Track3D *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
- if(&(*i)->get_track()==&t)
- return **i;
+ TrackMap::const_iterator i = tracks.find(&t);
+ if(i==tracks.end())
+ throw KeyError("Unknown track");
- throw KeyError("Unknown track");
+ return *i->second;
}
Track3D *Layout3D::pick_track(float x, float y, float size) const
Track3D *track = 0;
unsigned track_depth = numeric_limits<unsigned>::max();
for(vector<GL::SelectRecord>::iterator i=select_buf.begin(); i!=select_buf.end(); ++i)
- if(i->min_depth<track_depth)
+ if(i->min_depth<track_depth && !i->names.empty())
{
track = reinterpret_cast<Track3D *>(i->names.back());
track_depth = i->min_depth;
return track;
}
+void Layout3D::add_vehicle(Vehicle3D &v)
+{
+ if(vehicles.count(&v.get_vehicle()))
+ throw KeyError("Duplicate vehicle");
+
+ vehicles[&v.get_vehicle()] = &v;
+}
+
+void Layout3D::remove_vehicle(Vehicle3D &v)
+{
+ vehicles.erase(&v.get_vehicle());
+}
+
+Vehicle3D &Layout3D::get_vehicle(Vehicle &v) const
+{
+ VehicleMap::const_iterator i = vehicles.find(&v);
+ if(i==vehicles.end())
+ throw KeyError("Unknown vehicle");
+
+ return *i->second;
+}
+
void Layout3D::track_added(Track &t)
{
new Track3D(*this, t);
void Layout3D::track_removed(Track &t)
{
- for(list<Track3D *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
- if(&(*i)->get_track()==&t)
- {
- delete *i;
- return;
- }
+ TrackMap::iterator i = tracks.find(&t);
+ if(i!=tracks.end())
+ delete i->second;
+}
+
+void Layout3D::vehicle_added(Vehicle &v)
+{
+ new Vehicle3D(*this, v);
}
} // namespace Marklin