Take z coordinate into account when computing points on tracks

[r2c2.git] / source / libmarklin / train.cpp

diff --git a/source/libmarklin/train.cpp b/source/libmarklin/train.cpp
index 7af10280228fa751970c4df739f1506400dc7271..462ff1dff730318b18f35d049a540ccc16438d19 100644 (file)
--- a/source/libmarklin/train.cpp
+++ b/source/libmarklin/train.cpp
@@ -24,7 +24,9 @@ namespace Marklin {
 Train::Train(TrafficManager &tm, Locomotive &l):
        trfc_mgr(tm),
        loco(l),
+       pending_block(0),
        target_speed(0),
+       route(0),
        status("Unplaced"),
        travel_dist(0),
        travel_speed(0),
@@ -140,10 +142,7 @@ bool Train::free_block(Block *block)
 void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
 {
        if(try_reserve && t>try_reserve)
-       {
                reserve_more();
-               update_speed();
-       }
 
        if(cur_track)
        {
@@ -189,7 +188,6 @@ void Train::locomotive_reverse_changed(bool)
        for(list<BlockRef>::iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i)
                i->entry = i->block->traverse(i->entry);
        reserve_more();
-       update_speed();
 
        if(cur_track)
        {
@@ -240,11 +238,8 @@ void Train::sensor_event(bool state, Sensor *sensor)
                        if(i->block->get_sensor_id()==addr)
                                set_position(i->block->get_endpoints()[i->entry]);
 
-               if(target_speed)
-               {
-                       reserve_more();
+               if(target_speed && reserve_more()<2)
                        update_speed();
-               }
        }
        else
        {
@@ -261,7 +256,7 @@ void Train::sensor_event(bool state, Sensor *sensor)
                                break;
                        }
 
-               if(target_speed)
+               if(target_speed && pending_block && addr==pending_block->get_sensor_id())
                        reserve_more();
        }
 }
@@ -299,9 +294,11 @@ void Train::turnout_path_changed(unsigned, Turnout *turnout)
                                i = rsv_blocks.erase(i);
                        }
                        reserve_more();
-                       update_speed();
                        return;
                }
+
+       if(pending_block && tid==pending_block->get_turnout_id())
+               reserve_more();
 }
 
 unsigned Train::reserve_more()
@@ -314,13 +311,15 @@ unsigned Train::reserve_more()
        if(!last)
                return 0;
 
+       pending_block = 0;
+
        unsigned nsens = 0;
        for(list<BlockRef>::const_iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
                if(i->block->get_sensor_id())
                        ++nsens;
 
-       bool result = false;
-       while(nsens<2)
+       bool got_more = false;
+       while(nsens<3)
        {
                int exit = last->block->traverse(last->entry);
                if(exit<0)
@@ -328,20 +327,30 @@ unsigned Train::reserve_more()
 
                Block *link = last->block->get_link(exit);
                if(!link || !link->reserve(this))
+               {
+                       pending_block = link;
                        break;
+               }
 
                if(route && link->get_turnout_id())
                {
                        int path = route->get_turnout(link->get_turnout_id());
-                       if(path>=0)
-                               trfc_mgr.get_control().get_turnout(link->get_turnout_id()).set_path(path);
+                       Turnout &turnout = trfc_mgr.get_control().get_turnout(link->get_turnout_id());
+                       if(path>=0 && path!=turnout.get_path())
+                       {
+                               link->reserve(0);
+                               pending_block = link;
+                               turnout.set_path(path);
+                               break;
+                       }
                }
+
                rsv_blocks.push_back(BlockRef(link, link->get_endpoint_by_link(*last->block)));
                last = &rsv_blocks.back();
                if(last->block->get_sensor_id())
                {
                        ++nsens;
-                       result = true;
+                       got_more = true;
                }
        }
 
@@ -355,6 +364,9 @@ unsigned Train::reserve_more()
                        last = 0;
        }
 
+       if(got_more)
+               update_speed();
+
        return nsens;
 }