/* $Id$
This file is part of R²C²
-Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2011 Mikkosoft Productions, Mikko Rasa
Distributed under the GPL
*/
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())
}
}
+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;
void Layout::add_block(Block &b)
{
blocks.insert(&b);
+ b.signal_reserved.connect(sigc::bind<0>(signal_block_reserved, sigc::ref(b)));
+ if(b.get_sensor_id())
+ {
+ b.signal_state_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Layout::block_state_changed), sigc::ref(b)));
+ b.signal_state_changed.connect(sigc::bind<0>(signal_block_state_changed, sigc::ref(b)));
+ }
}
Block &Layout::get_block(unsigned id) const
dt = t-last_tick;
last_tick = t;
+ for(set<Block *>::iterator i=blocks.begin(); i!=blocks.end(); ++i)
+ (*i)->tick(dt);
for(map<unsigned, Train *>::iterator i=trains.begin(); i!=trains.end(); ++i)
i->second->tick(t, dt);
}
}
}
-void Layout::save_trains(const string &fn) const
+void Layout::save_dynamic(const string &fn) const
{
IO::BufferedFile out(fn, IO::M_WRITE);
DataFile::Writer writer(out);
+ 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()));
+
for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
{
DataFile::Statement st("train");
}
}
-void Layout::sensor_event(unsigned addr, bool state)
+void Layout::block_state_changed(Block &block, Block::State state)
{
- if(state)
- {
- 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;
- }
- }
+ if(state==Block::ACTIVE && !block.get_train())
+ emergency(format("Unreserved sensor %d triggered", block.get_sensor_id()));
}
add("route", static_cast<void (Loader::*)()>(&Loader::route));
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("zone", &Loader::zone);
// Deprecated aliases
load_sub(*trn);
}
+void Layout::Loader::turnout(unsigned addr, unsigned path)
+{
+ if(obj.driver)
+ obj.driver->set_turnout(addr, path);
+}
+
void Layout::Loader::zone()
{
Zone *zne = new Zone(obj);