#include "driver.h"
#include "layout.h"
#include "route.h"
+#include "signal.h"
+#include "signaltype.h"
#include "track.h"
#include "tracktype.h"
#include "train.h"
delete *routes.begin();
while(!zones.empty())
delete *zones.begin();
+ while(!signals.empty())
+ delete *signals.begin();
while(!tracks.empty())
delete *tracks.begin();
while(!blocks.empty())
}
}
+Track *Layout::pick_track(const Ray &ray)
+{
+ return pick(tracks, ray);
+}
+
void Layout::remove_track(Track &t)
{
if(tracks.erase(&t))
}
}
-Track *Layout::pick_track(const Vector &start, const Vector &ray)
-{
- for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
- if((*i)->collide_ray(start, ray))
- return *i;
-
- return 0;
-}
-
unsigned Layout::allocate_turnout_id()
{
set<unsigned> used_ids;
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);
+}
+
+Object *Layout::pick_object(const Ray &ray)
+{
+ if(Object *obj = pick_track(ray))
+ return obj;
+ else if((obj = pick_signal(ray)))
+ return obj;
+ return 0;
+}
+
+template<typename T>
+T *Layout::pick(const set<T *> &objs, const Ray &ray)
+{
+ for(typename set<T *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
+ if((*i)->collide_ray(ray))
+ return *i;
+
+ return 0;
+}
+
void Layout::add_block(Block &b)
{
blocks.insert(&b);
for(set<Block *>::iterator i=blocks.begin(); i!=blocks.end(); ++i)
(*i)->tick(dt);
+ for(set<Signal *>::iterator i=signals.begin(); i!=signals.end(); ++i)
+ (*i)->tick(dt);
for(map<unsigned, Train *>::iterator i=trains.begin(); i!=trains.end(); ++i)
i->second->tick(t, dt);
}
writer.write(st);
}
+ for(set<Signal *>::const_iterator i=signals.begin(); i!=signals.end(); ++i)
+ {
+ DataFile::Statement st("signal");
+ st.append((*i)->get_type().get_article_number());
+ (*i)->save(st.sub);
+ writer.write(st);
+ }
+
for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
{
if((*i)->is_temporary())
Layout::Loader::Loader(Layout &l):
- DataFile::BasicLoader<Layout>(l),
+ DataFile::ObjectLoader<Layout>(l),
new_tracks(false)
{
add("base", &Layout::base);
add("route", static_cast<void (Loader::*)()>(&Loader::route));
+ add("signal", &Loader::signal);
add("track", static_cast<void (Loader::*)(ArticleNumber)>(&Loader::track));
add("train", static_cast<void (Loader::*)(ArticleNumber, unsigned, const std::string &)>(&Loader::train));
add("turnout", &Loader::turnout);
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);
load_sub(*rte);
}
+void Layout::Loader::signal(ArticleNumber art_nr)
+{
+ Signal *sig = new Signal(obj, obj.catalogue.get_signal(art_nr));
+ load_sub(*sig);
+}
+
void Layout::Loader::track(unsigned art_nr)
{
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)