X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Flayout.cpp;h=302f13a55e1d7f8d4b6d7e5f58097092fe19d075;hb=5c1ddd2f213af3fea15237e02f7da112c0abba36;hp=fefa3e9b3fb4045e2d6ecf84280c0319fa2431ed;hpb=3e3675f8d86b06cdea7df197dfe8866ffb285aec;p=r2c2.git

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index fefa3e9..302f13a 100644
--- a/source/libr2c2/layout.cpp
+++ b/source/libr2c2/layout.cpp
@@ -50,6 +50,8 @@ Layout::~Layout()
 		delete *routes.begin();
 	while(!zones.empty())
 		delete *zones.begin();
+	while(!signals.empty())
+		delete *signals.begin();
 	while(!tracks.empty())
 		delete *tracks.begin();
 	while(!blocks.empty())
@@ -72,6 +74,11 @@ void Layout::add_track(Track &t)
 	}
 }
 
+Track *Layout::pick_track(const Ray &ray)
+{
+	return pick(tracks, ray);
+}
+
 void Layout::remove_track(Track &t)
 {
 	if(tracks.erase(&t))
@@ -81,40 +88,55 @@ void Layout::remove_track(Track &t)
 	}
 }
 
+unsigned Layout::allocate_turnout_id()
+{
+	set<unsigned> used_ids;
+	for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+		if((*i)->get_turnout_id())
+			used_ids.insert((*i)->get_turnout_id());
+
+	unsigned result = next_turnout_id;
+	while(used_ids.count(result))
+		++result;
+	next_turnout_id = result+1;
+
+	return result;
+}
+
 void Layout::add_signal(Signal &s)
 {
 	if(signals.insert(&s).second)
 		signal_signal_added.emit(s);
 }
 
+Signal *Layout::pick_signal(const Ray &ray)
+{
+	return pick(signals, ray);
+}
+
 void Layout::remove_signal(Signal &s)
 {
 	if(signals.erase(&s))
 		signal_signal_removed.emit(s);
 }
 
-Track *Layout::pick_track(const Vector &start, const Vector &ray)
+Object *Layout::pick_object(const Ray &ray)
 {
-	for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		if((*i)->collide_ray(start, ray))
-			return *i;
-
+	if(Object *obj = pick_track(ray))
+		return obj;
+	else if((obj = pick_signal(ray)))
+		return obj;
 	return 0;
 }
 
-unsigned Layout::allocate_turnout_id()
+template<typename T>
+T *Layout::pick(const set<T *> &objs, const Ray &ray)
 {
-	set<unsigned> used_ids;
-	for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		if((*i)->get_turnout_id())
-			used_ids.insert((*i)->get_turnout_id());
-
-	unsigned result = next_turnout_id;
-	while(used_ids.count(result))
-		++result;
-	next_turnout_id = result+1;
+	for(typename set<T *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
+		if((*i)->collide_ray(ray))
+			return *i;
 
-	return result;
+	return 0;
 }
 
 void Layout::add_block(Block &b)
@@ -385,12 +407,6 @@ Layout::Loader::Loader(Layout &l):
 	add("train", static_cast<void (Loader::*)(unsigned, unsigned, const std::string &)>(&Loader::train));
 }
 
-void Layout::Loader::finish()
-{
-	for(set<Track *>::iterator i=obj.tracks.begin(); i!=obj.tracks.end(); ++i)
-		(*i)->check_slope();
-}
-
 void Layout::Loader::route()
 {
 	Route *rte = new Route(obj);
@@ -422,7 +438,7 @@ void Layout::Loader::track(ArticleNumber art_nr)
 	new_tracks = true;
 	for(set<Track *>::iterator i=obj.tracks.begin(); i!=obj.tracks.end(); ++i)
 		if(*i!=trk)
-			trk->snap_to(**i, true);
+			trk->link_to(**i);
 }
 
 void Layout::Loader::train(unsigned art_nr, unsigned addr, const std::string &proto)