X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Flayout.cpp;h=b4eb8faacdbdb52d5d4786fe8495c747762c1c6a;hb=0d0b5fcbaf3e8eb1cbfd9764d19792c4383cce7b;hp=f318958879ba16049741222428fa8cc32412de34;hpb=710efe5438a585b071085fc7d7ea14aebd8328fd;p=r2c2.git

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index f318958..b4eb8fa 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;
 }
@@ -414,6 +430,15 @@ void Layout::save(const string &fn) const
 		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((*i)->get_type().get_article_number());
+		(*i)->save(st.sub);
+		writer.write(st);
+	}
+
 	const set<BeamGate *> &gates = objects.get<BeamGate>();
 	for(set<BeamGate *>::const_iterator i=gates.begin(); i!=gates.end(); ++i)
 	{
@@ -447,10 +472,16 @@ 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)
 	{
@@ -528,13 +559,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);
@@ -547,6 +579,11 @@ void Layout::Loader::beamgate()
 	load_sub(*gate);
 }
 
+void Layout::Loader::clock()
+{
+	load_sub(obj.clock);
+}
+
 void Layout::Loader::route()
 {
 	Route *rte = new Route(obj);
@@ -555,15 +592,20 @@ void Layout::Loader::route()
 
 void Layout::Loader::signal(ArticleNumber art_nr)
 {
-	Signal *sig = new Signal(obj, obj.catalogue.get_signal(art_nr));
+	Signal *sig = new Signal(obj, obj.catalogue.get<SignalType>(art_nr));
 	load_sub(*sig);
 }
 
+void Layout::Loader::terrain(ArticleNumber art_nr)
+{
+	Terrain *ter = new Terrain(obj, obj.catalogue.get<TerrainType>(art_nr));
+	load_sub(*ter);
+}
+
 void Layout::Loader::track(ArticleNumber art_nr)
 {
-	Track *trk = new Track(obj, obj.catalogue.get_track(art_nr));
+	Track *trk = new Track(obj, obj.catalogue.get<TrackType>(art_nr));
 	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)
@@ -572,7 +614,7 @@ void Layout::Loader::track(ArticleNumber art_nr)
 
 void Layout::Loader::train(ArticleNumber art_nr, 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>(art_nr), addr, proto);
 	load_sub(*trn);
 }