-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
#include <algorithm>
+#include <msp/core/maputils.h>
#include <msp/core/refptr.h>
#include <msp/datafile/parser.h>
#include <msp/datafile/writer.h>
#include "driver.h"
#include "layout.h"
#include "route.h"
+#include "signal.h"
+#include "signaltype.h"
#include "track.h"
+#include "trackcircuit.h"
#include "tracktype.h"
#include "train.h"
#include "vehicletype.h"
catalogue(c),
driver(d),
next_turnout_id(0x800)
-{
- if(driver)
- driver->signal_sensor.connect(sigc::mem_fun(this, &Layout::sensor_event));
-}
+{ }
Layout::~Layout()
{
delete driver;
+ driver = 0;
+
while(!trains.empty())
delete trains.begin()->second;
while(!routes.empty())
delete *routes.begin();
while(!zones.empty())
delete *zones.begin();
+ while(!signals.empty())
+ delete *signals.begin();
while(!tracks.empty())
delete *tracks.begin();
while(!blocks.empty())
Driver &Layout::get_driver() const
{
if(!driver)
- throw InvalidState("No driver");
+ throw logic_error("!driver");
return *driver;
}
}
}
+Track *Layout::pick_track(const Ray &ray)
+{
+ return pick(tracks, ray);
+}
+
void Layout::remove_track(Track &t)
{
if(tracks.erase(&t))
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);
+ b.signal_reserved.connect(sigc::bind<0>(signal_block_reserved, sigc::ref(b)));
}
Block &Layout::get_block(unsigned id) const
if((*i)->get_id()==id)
return **i;
- throw KeyError("Unknown block", lexical_cast(id));
+ throw key_error(id);
}
void Layout::create_blocks()
for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
if((*i)->get_name()==name)
return **i;
- throw KeyError("Unknown route", name);
+ throw key_error(name);
}
void Layout::update_routes()
if((*i)->get_group()==group && (*i)->get_number()==num)
return **i;
- throw KeyError("Unknown zone", format("%s %d", group, num));
+ throw key_error(format("%s %d", group, num));
}
void Layout::remove_zone(Zone &z)
void Layout::add_train(Train &t)
{
- if(trains.count(t.get_address()))
- throw KeyError("Duplicate train address", lexical_cast(t.get_address()));
-
- trains[t.get_address()] = &t;
+ insert_unique(trains, t.get_address(), &t);
signal_train_added.emit(t);
}
Train &Layout::get_train(unsigned addr) const
{
- map<unsigned, Train *>::const_iterator i = trains.find(addr);
- if(i==trains.end())
- throw KeyError("Unknown train", lexical_cast(addr));
- return *i->second;
+ return *get_item(trains, addr);
}
void Layout::remove_train(Train &t)
signal_vehicle_removed.emit(v);
}
+void Layout::add_sensor(Sensor &s)
+{
+ if(sensors.insert(&s).second)
+ {
+ s.signal_state_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Layout::sensor_state_changed), sigc::ref(s)));
+ s.signal_state_changed.connect(sigc::bind<0>(signal_sensor_state_changed, sigc::ref(s)));
+ }
+}
+
+void Layout::remove_sensor(Sensor &s)
+{
+ sensors.erase(&s);
+}
+
void Layout::tick()
{
if(driver)
dt = t-last_tick;
last_tick = t;
+ for(set<Sensor *>::iterator i=sensors.begin(); i!=sensors.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())
}
}
-void Layout::sensor_event(unsigned addr, bool state)
+void Layout::sensor_state_changed(Sensor &sensor, Sensor::State state)
{
- if(state)
+ if(state==Sensor::ACTIVE)
{
- for(set<Block *>::iterator i=blocks.begin(); i!=blocks.end(); ++i)
- if((*i)->get_sensor_id()==addr)
- {
- if(!(*i)->get_train())
- emergency(format("Unreserved sensor %d triggered", addr));
- break;
- }
+ Block *block = 0;
+ if(TrackCircuit *tc = dynamic_cast<TrackCircuit *>(&sensor))
+ block = &tc->get_block();
+
+ if(block && !block->get_train())
+ emergency(format("Unreserved sensor %d triggered", sensor.get_address()));
}
}
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)
projects / r2c2.git / blobdiff