Handle sensors in a separate class

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

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index 45b18e322fa6e8db5a065fb616e002b869b206a8..16542953a76320697ece0cb037767c70d9793ef3 100644 (file)
--- a/source/libr2c2/layout.cpp
+++ b/source/libr2c2/layout.cpp
@@ -13,6 +13,7 @@
 #include "signal.h"
 #include "signaltype.h"
 #include "track.h"
+#include "trackcircuit.h"
 #include "tracktype.h"
 #include "train.h"
 #include "vehicletype.h"
@@ -50,6 +51,8 @@ Layout::~Layout()
                delete *routes.begin();
        while(!zones.empty())
                delete *zones.begin();
+       while(!signals.empty())
+               delete *signals.begin();
        while(!tracks.empty())
                delete *tracks.begin();
        while(!blocks.empty())
@@ -72,9 +75,9 @@ void Layout::add_track(Track &t)
        }
 }
 
-Track *Layout::pick_track(const Vector &start, const Vector &ray)
+Track *Layout::pick_track(const Ray &ray)
 {
-       return pick(tracks, start, ray);
+       return pick(tracks, ray);
 }
 
 void Layout::remove_track(Track &t)
@@ -107,9 +110,9 @@ void Layout::add_signal(Signal &s)
                signal_signal_added.emit(s);
 }
 
-Signal *Layout::pick_signal(const Vector &start, const Vector &ray)
+Signal *Layout::pick_signal(const Ray &ray)
 {
-       return pick(signals, start, ray);
+       return pick(signals, ray);
 }
 
 void Layout::remove_signal(Signal &s)
@@ -118,20 +121,20 @@ void Layout::remove_signal(Signal &s)
                signal_signal_removed.emit(s);
 }
 
-Object *Layout::pick_object(const Vector &start, const Vector &ray)
+Object *Layout::pick_object(const Ray &ray)
 {
-       if(Object *obj = pick_track(start, ray))
+       if(Object *obj = pick_track(ray))
                return obj;
-       else if((obj = pick_signal(start, ray)))
+       else if((obj = pick_signal(ray)))
                return obj;
        return 0;
 }
 
 template<typename T>
-T *Layout::pick(const set<T *> &objs, const Vector &start, const Vector &ray)
+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(start, ray))
+               if((*i)->collide_ray(ray))
                        return *i;
 
        return 0;
@@ -141,11 +144,6 @@ 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
@@ -291,6 +289,20 @@ void Layout::remove_vehicle(Vehicle &v)
                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)
@@ -302,7 +314,7 @@ void Layout::tick()
                dt = t-last_tick;
        last_tick = t;
 
-       for(set<Block *>::iterator i=blocks.begin(); i!=blocks.end(); ++i)
+       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);
@@ -380,10 +392,17 @@ void Layout::save_dynamic(const string &fn) const
        }
 }
 
-void Layout::block_state_changed(Block &block, Block::State state)
+void Layout::sensor_state_changed(Sensor &sensor, Sensor::State state)
 {
-       if(state==Block::ACTIVE && !block.get_train())
-               emergency(format("Unreserved sensor %d triggered", block.get_sensor_id()));
+       if(state==Sensor::ACTIVE)
+       {
+               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()));
+       }
 }