X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Flayout.cpp;h=5f015766f6367ad53ae108d379cad9ab0c94861c;hb=1ff06c5bc46a677fa389ef86c6b26664368f1653;hp=8ea58bf8454661be87d7e731903411c8d35b3986;hpb=bc8ac89bbe774bb133b758416182aa18e5e0a5a5;p=r2c2.git

diff --git a/source/3d/layout.cpp b/source/3d/layout.cpp
index 8ea58bf..5f01576 100644
--- a/source/3d/layout.cpp
+++ b/source/3d/layout.cpp
@@ -1,6 +1,6 @@
 /* $Id$
 
-This file is part of the MSP Märklin suite
+This file is part of R²C²
 Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
@@ -13,13 +13,14 @@ Distributed under the GPL
 #include <msp/gl/select.h>
 #include <msp/gl/texture.h>
 #include <msp/datafile/parser.h>
-#include "libmarklin/trafficmanager.h"
 #include "layout.h"
+#include "track.h"
+#include "vehicle.h"
 
 using namespace std;
 using namespace Msp;
 
-namespace Marklin {
+namespace R2C2 {
 
 Layout3D::Layout3D(Layout &l):
 	layout(l),
@@ -27,6 +28,8 @@ 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));
+	layout.signal_vehicle_removed.connect(sigc::mem_fun(this, &Layout3D::vehicle_removed));
 
 	const set<Track *> &ltracks = layout.get_tracks();
 	for(set<Track *>::iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
@@ -36,30 +39,31 @@ Layout3D::Layout3D(Layout &l):
 Layout3D::~Layout3D()
 {
 	while(!tracks.empty())
-		delete tracks.front();
-	while(!trains.empty())
-		delete trains.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
@@ -89,7 +93,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;
@@ -98,30 +102,26 @@ Track3D *Layout3D::pick_track(float x, float y, float size) const
 	return track;
 }
 
-void Layout3D::set_traffic_manager(TrafficManager &tm)
+void Layout3D::add_vehicle(Vehicle3D &v)
 {
-	tm.signal_train_added.connect(sigc::mem_fun(this, &Layout3D::train_added));
-}
+	if(vehicles.count(&v.get_vehicle()))
+		throw KeyError("Duplicate vehicle");
 
-void Layout3D::add_train(Train3D &t)
-{
-	trains.push_back(&t);
+	vehicles[&v.get_vehicle()] = &v;
 }
 
-void Layout3D::remove_train(Train3D &t)
+void Layout3D::remove_vehicle(Vehicle3D &v)
 {
-	list<Train3D *>::iterator i = find(trains.begin(), trains.end(), &t);
-	if(i!=trains.end())
-		trains.erase(i);
+	vehicles.erase(&v.get_vehicle());
 }
 
-Train3D &Layout3D::get_train(const Train &t) const
+Vehicle3D &Layout3D::get_vehicle(Vehicle &v) const
 {
-	for(list<Train3D *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
-		if(&(*i)->get_train()==&t)
-			return **i;
+	VehicleMap::const_iterator i = vehicles.find(&v);
+	if(i==vehicles.end())
+		throw KeyError("Unknown vehicle");
 
-	throw KeyError("Unknown train");
+	return *i->second;
 }
 
 void Layout3D::track_added(Track &t)
@@ -131,17 +131,21 @@ void Layout3D::track_added(Track &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);
 }
 
-void Layout3D::train_added(Train &t)
+void Layout3D::vehicle_removed(Vehicle &v)
 {
-	new Train3D(*this, t);
+	VehicleMap::iterator i = vehicles.find(&v);
+	if(i!=vehicles.end())
+		delete i->second;
 }
 
-} // namespace Marklin
+} // namespace R2C2