X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Flayout.cpp;h=0901382b91d0f140bb8ddf39010bf41228b33bfb;hb=81ee4fbd16b472892b67b35ea85956423a2247ed;hp=b847637fab797481a34225ccf88dea9a2d29ceb4;hpb=c4daf1cc6b53cae34e46d4125a993ceed500de1a;p=r2c2.git

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index b847637..0901382 100644
--- a/source/libr2c2/layout.cpp
+++ b/source/libr2c2/layout.cpp
@@ -13,6 +13,7 @@
 #include "route.h"
 #include "signal.h"
 #include "signaltype.h"
+#include "terrain.h"
 #include "track.h"
 #include "trackcircuit.h"
 #include "tracktype.h"
@@ -39,7 +40,7 @@ namespace R2C2 {
 Layout::Layout(Catalogue &c, Driver *d):
 	catalogue(c),
 	driver(d),
-	next_turnout_id(0x800)
+	next_turnout_addr(0x800)
 {
 	clock.set_rate(60);
 }
@@ -135,6 +136,12 @@ const set<Vehicle *> &Layout::get_all<Vehicle>() const
 	return objects.get<Vehicle>();
 }
 
+template<>
+const set<Terrain *> &Layout::get_all<Terrain>() const
+{
+	return objects.get<Terrain>();
+}
+
 template<>
 const set<TrackChain *> &Layout::get_all<TrackChain>() const
 {
@@ -181,12 +188,21 @@ template<typename T>
 T *Layout::pick(const Ray &ray)
 {
 	const set<Object *> &objs = objects.get();
+	T *closest = 0;
+	float distance = -1;
 	for(set<Object *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
 		if(T *t = dynamic_cast<T *>(*i))
-			if(t->collide_ray(ray))
-				return t;
+		{
+			float d = -1;
+			if(t->collide_ray(ray, &d))
+				if(!closest || d<distance)
+				{
+					closest = t;
+					distance = d;
+				}
+		}
 
-	return 0;
+	return closest;
 }
 
 template Object *Layout::pick<Object>(const Ray &);
@@ -227,18 +243,18 @@ void Layout::remove(BeamGate &g)
 	remove(static_cast<Sensor &>(g));
 }
 
-unsigned Layout::allocate_turnout_id()
+unsigned Layout::allocate_turnout_address()
 {
-	set<unsigned> used_ids;
+	set<unsigned> used_addrs;
 	const set<Track *> &tracks = objects.get<Track>();
 	for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		if((*i)->get_turnout_id())
-			used_ids.insert((*i)->get_turnout_id());
+		if((*i)->get_type().is_turnout())
+			used_addrs.insert((*i)->get_turnout_address());
 
-	unsigned result = next_turnout_id;
-	while(used_ids.count(result))
+	unsigned result = next_turnout_addr;
+	while(used_addrs.count(result))
 		++result;
-	next_turnout_id = result+1;
+	next_turnout_addr = result+1;
 
 	return result;
 }
@@ -255,26 +271,31 @@ Block &Layout::get_block(unsigned id) const
 
 void Layout::create_blocks()
 {
-	set<Track *> used_tracks;
+	set<Track *> loose_tracks = objects.get<Track>();
 	const set<Block *> *blocks = &track_chains.get<Block>();
 	for(set<Block *>::const_iterator i=blocks->begin(); i!=blocks->end(); ++i)
 	{
 		const set<Track *> &btracks = (*i)->get_tracks();
-		used_tracks.insert(btracks.begin(), btracks.end());
+		for(set<Track *>::const_iterator j=btracks.begin(); j!=btracks.end(); ++j)
+			loose_tracks.erase(*j);
 	}
 
-	const set<Track *> &tracks = objects.get<Track>();
-	for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		if(used_tracks.count(*i)==0)
-		{
-			Block *block = new Block(*this, **i);
-			used_tracks.insert(block->get_tracks().begin(), block->get_tracks().end());
-		}
+	list<Block *> created_blocks;
+	while(!loose_tracks.empty())
+	{
+		Block *block = new Block(*this, **loose_tracks.begin());
+		created_blocks.push_back(block);
 
+		const set<Track *> &btracks = block->get_tracks();
+		for(set<Track *>::const_iterator i=btracks.begin(); i!=btracks.end(); ++i)
+			loose_tracks.erase(*i);
+	}
+
+	// The previously obtained set has been invalidated by creating new blocks
 	blocks = &track_chains.get<Block>();
-	for(set<Block *>::iterator i=blocks->begin(); i!=blocks->end(); ++i)
-		for(set<Block *>::iterator j=i; j!=blocks->end(); ++j)
-			if(j!=i)
+	for(list<Block *>::iterator i=created_blocks.begin(); i!=created_blocks.end(); ++i)
+		for(set<Block *>::const_iterator j=blocks->begin(); j!=blocks->end(); ++j)
+			if(*j!=*i)
 				(*i)->check_link(**j);
 }
 
@@ -364,7 +385,8 @@ void Layout::tick()
 		dt = t-last_tick;
 	last_tick = t;
 
-	clock.tick(dt);
+	if(!driver || !driver->is_halted())
+		clock.tick(dt);
 
 	for(set<Sensor *>::iterator i=sensors.get().begin(); i!=sensors.get().end(); ++i)
 		(*i)->tick(dt);
@@ -375,12 +397,15 @@ void Layout::tick()
 		i->second->tick(dt);
 }
 
-void Layout::emergency(const string &msg)
+void Layout::emergency(Block *block, const string &msg)
 {
 	if(driver)
 		driver->halt(true);
-	IO::print("Emergency: %s\n", msg);
-	signal_emergency.emit(msg);
+	if(block)
+		IO::print("Emergency at %s: %s\n", block->get_name(), msg);
+	else
+		IO::print("Emergency: %s\n", msg);
+	signal_emergency.emit(block, msg);
 }
 
 void Layout::save(const string &fn) const
@@ -395,7 +420,7 @@ void Layout::save(const string &fn) const
 	for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
 	{
 		DataFile::Statement st("track");
-		st.append((*i)->get_type().get_article_number());
+		st.append(catalogue.get_name(&(*i)->get_type()));
 		(*i)->save(st.sub);
 		writer.write(st);
 	}
@@ -404,7 +429,16 @@ void Layout::save(const string &fn) const
 	for(set<Signal *>::const_iterator i=signals.begin(); i!=signals.end(); ++i)
 	{
 		DataFile::Statement st("signal");
-		st.append((*i)->get_type().get_article_number());
+		st.append(catalogue.get_name(&(*i)->get_type()));
+		(*i)->save(st.sub);
+		writer.write(st);
+	}
+
+	const set<Terrain *> &terrains = objects.get<Terrain>();
+	for(set<Terrain *>::const_iterator i=terrains.begin(); i!=terrains.end(); ++i)
+	{
+		DataFile::Statement st("terrain");
+		st.append(catalogue.get_name(&(*i)->get_type()));
 		(*i)->save(st.sub);
 		writer.write(st);
 	}
@@ -442,15 +476,21 @@ void Layout::save_dynamic(const string &fn) const
 	IO::BufferedFile out(fn, IO::M_WRITE);
 	DataFile::Writer writer(out);
 
+	{
+		DataFile::Statement st("clock");
+		clock.save(st.sub);
+		writer.write(st);
+	}
+
 	const set<Track *> &tracks = objects.get<Track>();
 	for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		if(unsigned tid = (*i)->get_turnout_id())
-			writer.write((DataFile::Statement("turnout"), tid, (*i)->get_active_path()));
+		if((*i)->get_type().is_turnout())
+			writer.write((DataFile::Statement("turnout"), (*i)->get_turnout_address(), (*i)->get_active_path()));
 
 	for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
 	{
 		DataFile::Statement st("train");
-		st.append(i->second->get_locomotive_type().get_article_number());
+		st.append(catalogue.get_name(&i->second->get_locomotive_type()));
 		st.append(i->second->get_address());
 		st.append(i->second->get_protocol());
 		i->second->save(st.sub);
@@ -464,7 +504,7 @@ void Layout::sensor_state_changed(Sensor &sensor, Sensor::State state)
 	{
 		Block *block = sensor.get_block();
 		if(block && !block->get_train())
-			emergency(format("Unreserved sensor %d triggered", sensor.get_address()));
+			emergency(block, "Unreserved sensor triggered");
 	}
 }
 
@@ -523,13 +563,14 @@ void Layout::Storage<B>::del()
 
 
 Layout::Loader::Loader(Layout &l):
-	DataFile::ObjectLoader<Layout>(l),
-	new_tracks(false)
+	DataFile::ObjectLoader<Layout>(l)
 {
 	add("base",  &Layout::base);
 	add("beamgate", &Loader::beamgate);
+	add("clock", &Loader::clock);
 	add("route", &Loader::route);
 	add("signal", &Loader::signal);
+	add("terrain", &Loader::terrain);
 	add("track", &Loader::track);
 	add("train", &Loader::train);
 	add("turnout", &Loader::turnout);
@@ -542,32 +583,42 @@ void Layout::Loader::beamgate()
 	load_sub(*gate);
 }
 
+void Layout::Loader::clock()
+{
+	load_sub(obj.clock);
+}
+
 void Layout::Loader::route()
 {
 	Route *rte = new Route(obj);
 	load_sub(*rte);
 }
 
-void Layout::Loader::signal(ArticleNumber art_nr)
+void Layout::Loader::signal(const string &n)
 {
-	Signal *sig = new Signal(obj, obj.catalogue.get_signal(art_nr));
+	Signal *sig = new Signal(obj, obj.catalogue.get<SignalType>(n));
 	load_sub(*sig);
 }
 
-void Layout::Loader::track(ArticleNumber art_nr)
+void Layout::Loader::terrain(const string &n)
+{
+	Terrain *ter = new Terrain(obj, obj.catalogue.get<TerrainType>(n));
+	load_sub(*ter);
+}
+
+void Layout::Loader::track(const string &n)
 {
-	Track *trk = new Track(obj, obj.catalogue.get_track(art_nr));
+	Track *trk = new Track(obj, obj.catalogue.get<TrackType>(n));
 	load_sub(*trk);
-	new_tracks = true;
 	const set<Track *> &tracks = obj.objects.get<Track>();
 	for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
 		if(*i!=trk)
 			trk->link_to(**i);
 }
 
-void Layout::Loader::train(ArticleNumber art_nr, unsigned addr, const std::string &proto)
+void Layout::Loader::train(const string &n, unsigned addr, const std::string &proto)
 {
-	Train *trn = new Train(obj, obj.catalogue.get_vehicle(art_nr), addr, proto);
+	Train *trn = new Train(obj, obj.catalogue.get<VehicleType>(n), addr, proto);
 	load_sub(*trn);
 }