Pass sensor events through blocks

[r2c2.git] / source / libr2c2 / layout.cpp

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index a55819bdb3db2763abc7825a8b6fc6121fbac426..df6989d3320cd3c7cbf4fb0f850915920f8ff431 100644 (file)
--- a/source/libr2c2/layout.cpp
+++ b/source/libr2c2/layout.cpp
@@ -1,7 +1,7 @@
 /* $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
 */
 
@@ -41,18 +41,19 @@ Layout::Layout(Catalogue &c, Driver *d):
        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(!tracks.empty())
                delete *tracks.begin();
        while(!blocks.empty())
@@ -84,6 +85,15 @@ void Layout::remove_track(Track &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;
@@ -102,6 +112,12 @@ unsigned Layout::allocate_turnout_id()
 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
@@ -264,6 +280,8 @@ void Layout::tick()
                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);
 }
@@ -310,11 +328,15 @@ void Layout::save(const string &fn) const
        }
 }
 
-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");
@@ -326,18 +348,10 @@ void Layout::save_trains(const string &fn) const
        }
 }
 
-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()));
 }
 
 
@@ -349,6 +363,7 @@ Layout::Loader::Loader(Layout &l):
        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
@@ -402,6 +417,12 @@ void Layout::Loader::train(ArticleNumber art_nr, unsigned addr, const std::strin
        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);