#include <algorithm>
#include <msp/core/maputils.h>
+#include <msp/core/raii.h>
#include <msp/core/refptr.h>
#include <msp/datafile/parser.h>
#include <msp/datafile/writer.h>
#include "route.h"
#include "signal.h"
#include "signaltype.h"
+#include "terrain.h"
#include "track.h"
#include "trackcircuit.h"
#include "tracktype.h"
Layout::Layout(Catalogue &c, Driver *d):
catalogue(c),
driver(d),
- next_turnout_addr(0x800)
+ next_turnout_addr(0x800),
+ emitting_block_reserved(false)
{
clock.set_rate(60);
}
void Layout::add(Object &o)
{
if(objects.insert(o))
- signal_object_added.emit(o);
+ {
+ try
+ {
+ signal_object_added.emit(o);
+ }
+ catch(...)
+ {
+ objects.erase(o);
+ throw;
+ }
+ }
}
void Layout::add(Track &t)
{
if(objects.insert(t))
{
- // Blocks must be recreated first
- create_blocks();
- signal_object_added.emit(t);
+ try
+ {
+ // Blocks must be recreated first
+ create_blocks();
+ signal_object_added.emit(t);
+ }
+ catch(...)
+ {
+ objects.erase(t);
+ create_blocks();
+ throw;
+ }
}
}
void Layout::add(TrackChain &g)
{
if(track_chains.insert(g))
- signal_track_chain_added.emit(g);
+ {
+ try
+ {
+ signal_track_chain_added.emit(g);
+ }
+ catch(...)
+ {
+ track_chains.erase(g);
+ throw;
+ }
+ }
}
void Layout::add(Block &b)
{
if(track_chains.insert(b))
{
- b.signal_reserved.connect(sigc::bind<0>(signal_block_reserved, sigc::ref(b)));
- signal_track_chain_added.emit(b);
+ sigc::connection conn = b.signal_reserved.connect(sigc::bind<0>(sigc::mem_fun(this, &Layout::block_reserved), sigc::ref(b)));
+ try
+ {
+ signal_track_chain_added.emit(b);
+ }
+ catch(...)
+ {
+ track_chains.erase(b);
+ conn.disconnect();
+ throw;
+ }
}
}
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
{
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 &);
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_address())
+ if((*i)->get_type().is_turnout())
used_addrs.insert((*i)->get_turnout_address());
unsigned result = next_turnout_addr;
signal_train_removed.emit(t);
}
-void Layout::tick()
+void Layout::tick(float speed)
{
if(driver)
driver->tick();
dt = t-last_tick;
last_tick = t;
- clock.tick(dt);
+ dt *= speed;
+ unsigned count = dt/(10*Time::msec)+1;
+ dt /= count;
+ while(count--)
+ step(dt);
+}
+
+void Layout::step(const Time::TimeDelta &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);
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
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);
}
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);
}
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 taddr = (*i)->get_turnout_address())
- writer.write((DataFile::Statement("turnout"), taddr, (*i)->get_active_path()));
+ if((*i)->get_type().is_turnout())
+ {
+ DataFile::Statement st("turnout");
+ st.append((*i)->get_turnout_address());
+ (*i)->save_dynamic(st.sub);
+ writer.write(st);
+ }
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);
{
Block *block = sensor.get_block();
if(block && !block->get_train())
- emergency(format("Unreserved sensor %d triggered", sensor.get_address()));
+ emergency(block, "Unreserved sensor triggered");
+ }
+}
+
+void Layout::block_reserved(Block &block, Train *train)
+{
+ if(emitting_block_reserved)
+ {
+ if(!train)
+ {
+ for(deque<BlockReservation>::iterator i=block_reserve_queue.end(); i!=block_reserve_queue.begin(); )
+ if((--i)->block==&block)
+ {
+ block_reserve_queue.erase(i);
+ return;
+ }
+ }
+
+ block_reserve_queue.push_back(BlockReservation(block, train));
+ }
+ else
+ {
+ SetFlag setf(emitting_block_reserved);
+ signal_block_reserved.emit(block, train);
+ while(!block_reserve_queue.empty())
+ {
+ BlockReservation br = block_reserve_queue.front();
+ block_reserve_queue.pop_front();
+ signal_block_reserved.emit(*br.block, br.train);
+ }
}
}
}
+Layout::BlockReservation::BlockReservation(Block &b, Train *t):
+ block(&b),
+ train(t)
+{ }
+
+
Layout::Loader::Loader(Layout &l):
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);
add("zone", &Loader::zone);
+
+ // Deprecated
+ add("turnout", &Loader::turnout2);
}
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<SignalType>(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)
{
- Track *trk = new Track(obj, obj.catalogue.get<TrackType>(art_nr));
+ 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<TrackType>(n));
load_sub(*trk);
const set<Track *> &tracks = obj.objects.get<Track>();
for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
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<VehicleType>(art_nr), addr, proto);
+ Train *trn = new Train(obj, obj.catalogue.get<VehicleType>(n), addr, proto);
load_sub(*trn);
}
-void Layout::Loader::turnout(unsigned addr, unsigned path)
+void Layout::Loader::turnout(unsigned addr)
+{
+ /* Kinda slow, but maintaining a map of turnouts seems more trouble than
+ it's worth at this point. */
+ const set<Track *> &tracks = obj.objects.get<Track>();
+ for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+ if((*i)->get_turnout_address()==addr)
+ {
+ load_sub(**i);
+ return;
+ }
+
+ throw key_error(addr);
+}
+
+void Layout::Loader::turnout2(unsigned addr, unsigned path)
{
+ // XXX Discrepancy between ids and addresses
if(obj.driver)
obj.driver->set_turnout(addr, path);
}
projects / r2c2.git / blobdiff