Basic support for beam gate sensors

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

diff --git a/source/libr2c2/blockallocator.cpp b/source/libr2c2/blockallocator.cpp
index 2a2473732aac1e24cfd0b75fc62256ed8f60bf8e..8d3381da20ecada6172781d064b9feba998e669a 100644 (file)
--- a/source/libr2c2/blockallocator.cpp
+++ b/source/libr2c2/blockallocator.cpp
@@ -1,5 +1,6 @@
 #include <msp/core/maputils.h>
 #include <msp/core/raii.h>
+#include "beamgate.h"
 #include "blockallocator.h"
 #include "block.h"
 #include "catalogue.h"
@@ -273,11 +274,18 @@ bool BlockAllocator::reserve_block(const BlockIter &block)
        }
 }
 
-void BlockAllocator::advance_front(const Block *block)
+void BlockAllocator::advance_front(const Block *block, bool inclusive)
 {
        BlockList::iterator end;
        if(block)
-               end = find_if(cur_blocks_end, blocks.end(), BlockMatch(*block));
+       {
+               end = cur_blocks_end;
+               if(inclusive)
+                       --end;
+               end = find_if(end, blocks.end(), BlockMatch(*block));
+               if(inclusive && end!=blocks.end())
+                       ++end;
+       }
        else
                end = blocks.end();
 
@@ -291,7 +299,10 @@ void BlockAllocator::advance_front(const Block *block)
 
 void BlockAllocator::advance_front(const Sensor *sensor)
 {
-       advance_front(sensor ? sensor->get_block() : 0);
+       if(sensor)
+               advance_front(sensor->get_block(), dynamic_cast<const BeamGate *>(sensor));
+       else
+               advance_front(0, false);
 }
 
 void BlockAllocator::advance_back()
@@ -303,17 +314,37 @@ void BlockAllocator::advance_back()
        block list and locate the first sensor that's still active. */
        Sensor *last_inactive = 0;
        for(BlockList::iterator i=blocks.begin(); (i!=cur_blocks_end && i->block()!=&veh_block); ++i)
+       {
+               list<Sensor *> sensors;
                if(Sensor *sensor = (*i)->get_sensor())
+                       sensors.push_back(sensor);
+
+               Block *block = &**i;
+               for(TrackIter j=i->track_iter(); (j && &j->get_block()==block); j=j.next())
+                       if(!j->get_attachments().empty())
+                       {
+                               Track::AttachmentList attachments = j->get_attachments_ordered(j.entry());
+                               for(Track::AttachmentList::const_iterator k=attachments.begin(); k!=attachments.end(); ++k)
+                                       if(BeamGate *gate = dynamic_cast<BeamGate *>(*k))
+                                               sensors.push_back(gate);
+                       }
+
+               for(list<Sensor *>::const_iterator j=sensors.begin(); j!=sensors.end(); ++j)
                {
-                       if(sensor->get_state())
+                       if((*j)->get_state())
                        {
                                if(last_inactive)
+                               {
+                                       if(dynamic_cast<BeamGate *>(*j))
+                                               ++i;
                                        release_blocks_begin(i);
+                               }
                                return;
                        }
                        else
-                               last_inactive = sensor;
+                               last_inactive = *j;
                }
+       }
 }
 
 void BlockAllocator::release_blocks_begin(const BlockList::iterator &end)
@@ -416,17 +447,48 @@ void BlockAllocator::sensor_state_changed(Sensor &sensor, Sensor::State state)
 
 void BlockAllocator::update_next_sensor(Sensor *after)
 {
+       BeamGate *after_gate = dynamic_cast<BeamGate *>(after);
+
        BlockList::iterator i = cur_blocks_end;
        if(after)
+       {
+               if(after_gate)
+                       --i;
                i = find_if(i, blocks.end(), BlockMatch(*after->get_block()));
+       }
 
        for(; i!=blocks.end(); ++i)
+       {
                if(Sensor *sensor = (*i)->get_sensor())
-                       if(sensor!=next_sensor)
+               {
+                       if(!after_gate && sensor!=next_sensor)
                        {
                                next_sensor = sensor;
                                return;
                        }
+               }
+
+               Block *block = &**i;
+               for(TrackIter j=i->track_iter(); (j && &j->get_block()==block); j=j.next())
+                       if(!j->get_attachments().empty())
+                       {
+                               Track::AttachmentList attachments = j->get_attachments_ordered(j.entry());
+                               for(Track::AttachmentList::const_iterator k=attachments.begin(); k!=attachments.end(); ++k)
+                                       if(BeamGate *gate = dynamic_cast<BeamGate *>(*k))
+                                       {
+                                               if(after_gate)
+                                               {
+                                                       if(gate==after_gate)
+                                                               after_gate = 0;
+                                               }
+                                               else
+                                               {
+                                                       next_sensor = gate;
+                                                       return;
+                                               }
+                                       }
+                       }
+       }
 
        next_sensor = 0;
 }