X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Flayout.cpp;h=70c55096cfa91eed259b6be9ebd99ef701dfd88c;hb=9ddcd066e37e4c72685817c042c30897786ece05;hp=a8fbc1ea0706ea61e08ecb1f2550d3d168e0e3f3;hpb=48dff17ed3144d944965e7cb534e1f8fb92bd620;p=r2c2.git

diff --git a/source/3d/layout.cpp b/source/3d/layout.cpp
index a8fbc1e..70c5509 100644
--- a/source/3d/layout.cpp
+++ b/source/3d/layout.cpp
@@ -14,6 +14,8 @@ Distributed under the GPL
 #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;
@@ -26,6 +28,7 @@ Layout3D::Layout3D(Layout &l):
 {
 	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 *> &ltracks = layout.get_tracks();
 	for(set<Track *>::iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
@@ -36,6 +39,8 @@ Layout3D::~Layout3D()
 {
 	while(!tracks.empty())
 		delete tracks.front();
+	while(!vehicles.empty())
+		delete vehicles.front();
 }
 
 void Layout3D::add_track(Track3D &t)
@@ -86,7 +91,7 @@ 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;
@@ -95,6 +100,27 @@ Track3D *Layout3D::pick_track(float x, float y, float size) const
 	return track;
 }
 
+void Layout3D::add_vehicle(Vehicle3D &v)
+{
+	vehicles.push_back(&v);
+}
+
+void Layout3D::remove_vehicle(Vehicle3D &v)
+{
+	list<Vehicle3D *>::iterator i = find(vehicles.begin(), vehicles.end(), &v);
+	if(i!=vehicles.end())
+		vehicles.erase(i);
+}
+
+Vehicle3D &Layout3D::get_vehicle(const Vehicle &v) const
+{
+	for(list<Vehicle3D *>::const_iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
+		if(&(*i)->get_vehicle()==&v)
+			return **i;
+
+	throw KeyError("Unknown vehicle");
+}
+
 void Layout3D::track_added(Track &t)
 {
 	new Track3D(*this, t);
@@ -110,4 +136,9 @@ void Layout3D::track_removed(Track &t)
 		}
 }
 
+void Layout3D::vehicle_added(Vehicle &v)
+{
+	new Vehicle3D(*this, v);
+}
+
 } // namespace Marklin