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 cbaa520cd20d945c5e1249ba5679fddb07c9b9b9..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,9 +25,13 @@ public:
                void route(const std::string &);
        };
 
-       sigc::signal<void, const Route *> signal_route_changed;
-       sigc::signal<void, const TrackChain *> signal_arrived;
-       sigc::signal<void, const TrackChain *> signal_waypoint_reached;
+       struct Waypoint
+       {
+               const TrackChain *chain;
+               TrackChain::Direction direction;
+
+               Waypoint(const TrackChain &, TrackChain::Direction = TrackChain::UNSPECIFIED);
+       };
 
        struct SequencePoint
        {
@@ -37,23 +41,41 @@ public:
                unsigned sequence_out;
 
                SequencePoint(Block &, unsigned);
+
+               bool is_cleared() const;
        };
 
 private:
        typedef std::list<const Route *> RouteList;
 
+       enum ArrivalState
+       {
+               ON_THE_WAY,
+               WAITING_FOR_SEQUENCE,
+               RESERVED_TO_END,
+               ADVANCED_TO_END,
+               ARRIVED
+       };
+
+public:
+       sigc::signal<void, const Route *> signal_route_changed;
+       sigc::signal<void, const TrackChain *> signal_arrived;
+       sigc::signal<void, const TrackChain *> signal_waypoint_reached;
+
+private:
        int priority;
        RouteList routes;
-       unsigned arriving;
-       const TrackChain *destination;
-       std::vector<const TrackChain *> waypoints;
-       bool destination_changed;
+       RouteList::iterator reserving_route;
+       ArrivalState arrival;
+       std::vector<Waypoint> waypoints;
+       bool waypoints_changed;
        std::vector<TrainRouteMetric *> metrics;
        bool metrics_stale;
        std::list<SequencePoint> sequence_points;
-       std::list<SequencePoint *> pending_sequence_checks;
        unsigned current_sequence;
+       bool sequence_check_pending;
        Msp::Time::TimeDelta delay;
+       Msp::Time::TimeDelta duration;
        Msp::RefPtr<TrainRoutePlanner> planner;
 
 public:
@@ -67,18 +89,20 @@ 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; }
-       bool is_destination(Track &) const;
-       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(); }
-       bool is_waypoint(unsigned, Track &) 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; }
+       void set_trip_duration(const Msp::Time::TimeDelta &);
+       const Msp::Time::TimeDelta &get_trip_duration() const { return duration; }
 
        virtual void message(const Message &);
        virtual void tick(const Msp::Time::TimeDelta &);
@@ -88,14 +112,15 @@ public:
 private:
        void block_reserved(Block &, Train *);
        void train_advanced(Block &);
-       const Route *get_route_for_block(const Block &) const;
+       void train_rear_advanced(Block &);
 
        void create_metrics();
-       Route *create_lead_route(Route *, const Route *);
-       bool advance_route(RouteList::iterator &, const Block &);
-       bool is_on_route(const Block &);
+       bool create_lead_route();
+       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