Allow direction to be specified for routing waypoints

[r2c2.git] / source / libr2c2 / trainrouter.h

diff --git a/source/libr2c2/trainrouter.h b/source/libr2c2/trainrouter.h
index 7a560a11904d7475b961198d191b6103585ec311..835ec484737761663da76d30eb97246d0a6178bd 100644 (file)
--- a/source/libr2c2/trainrouter.h
+++ b/source/libr2c2/trainrouter.h
@@ -3,6 +3,7 @@
 
 #include <list>
 #include <msp/datafile/objectloader.h>
+#include "trackchain.h"
 #include "trainai.h"
 
 namespace R2C2 {
@@ -10,7 +11,6 @@ namespace R2C2 {
 class Block;
 class Layout;
 class Track;
-class TrackChain;
 class TrainRouteMetric;
 class TrainRoutePlanner;
 
@@ -25,6 +25,14 @@ public:
                void route(const std::string &);
        };
 
+       struct Waypoint
+       {
+               const TrackChain *chain;
+               TrackChain::Direction direction;
+
+               Waypoint(const TrackChain &, TrackChain::Direction = TrackChain::UNSPECIFIED);
+       };
+
        struct SequencePoint
        {
                Block *block;
@@ -43,7 +51,9 @@ private:
        enum ArrivalState
        {
                ON_THE_WAY,
+               WAITING_FOR_SEQUENCE,
                RESERVED_TO_END,
+               ADVANCED_TO_END,
                ARRIVED
        };
 
@@ -57,9 +67,8 @@ private:
        RouteList routes;
        RouteList::iterator reserving_route;
        ArrivalState arrival;
-       const TrackChain *destination;
-       std::vector<const TrackChain *> waypoints;
-       bool destination_changed;
+       std::vector<Waypoint> waypoints;
+       bool waypoints_changed;
        std::vector<TrainRouteMetric *> metrics;
        bool metrics_stale;
        std::list<SequencePoint> sequence_points;
@@ -80,14 +89,15 @@ public:
        const Route *get_route() const;
        unsigned get_current_sequence() const { return current_sequence; }
 private:
+       void use_planned_route();
        void route_changed();
 
 public:
        void set_destination(const TrackChain &);
-       const TrackChain *get_destination() const { return destination; }
-       void add_waypoint(const TrackChain &);
+       const TrackChain *get_destination() const { return waypoints.empty() ? 0 : waypoints.back().chain; }
+       void add_waypoint(const TrackChain &, TrackChain::Direction = TrackChain::UNSPECIFIED);
        unsigned get_n_waypoints() const { return waypoints.size(); }
-       const TrackChain &get_waypoint(unsigned) const;
+       const Waypoint &get_waypoint(unsigned) const;
        const TrainRouteMetric &get_metric(int = -1) const;
        void set_departure_delay(const Msp::Time::TimeDelta &);
        const Msp::Time::TimeDelta &get_departure_delay() const { return delay; }
@@ -106,10 +116,11 @@ private:
 
        void create_metrics();
        bool create_lead_route();
-       bool is_valid_for_track(const Route &, Track &) const;
-       bool advance_to_track(RouteList::iterator &, Track &);
+       bool advance_to_track(RouteList::iterator &, const TrackIter &);
 
+       static void get_routers(Layout &, std::vector<TrainRouter *> &);
        static void start_planning(Layout &);
+       static void apply_plan(Layout &, TrainRoutePlanner &);
 };
 
 } // namespace R2C2