X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.h;h=c7c1be18b9a6f5cd55f00c632f049f253bf4e436;hb=03a22611772265b539f826f1f8bc482e71ca4a99;hp=7a560a11904d7475b961198d191b6103585ec311;hpb=462a04be004ab4b0ff3ce14c51a19b50271b17c7;p=r2c2.git

diff --git a/source/libr2c2/trainrouter.h b/source/libr2c2/trainrouter.h
index 7a560a1..c7c1be1 100644
--- 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;
@@ -40,15 +48,19 @@ public:
 private:
 	typedef std::list<const Route *> RouteList;
 
-	enum ArrivalState
+	enum TravelState
 	{
 		ON_THE_WAY,
+		WAITING_FOR_SEQUENCE,
+		SEQUENCE_CHECK_PENDING,
 		RESERVED_TO_END,
+		ADVANCED_TO_END,
 		ARRIVED
 	};
 
 public:
 	sigc::signal<void, const Route *> signal_route_changed;
+	sigc::signal<void> signal_departed;
 	sigc::signal<void, const TrackChain *> signal_arrived;
 	sigc::signal<void, const TrackChain *> signal_waypoint_reached;
 
@@ -56,15 +68,13 @@ private:
 	int priority;
 	RouteList routes;
 	RouteList::iterator reserving_route;
-	ArrivalState arrival;
-	const TrackChain *destination;
-	std::vector<const TrackChain *> waypoints;
-	bool destination_changed;
+	TravelState state;
+	std::vector<Waypoint> waypoints;
+	bool waypoints_changed;
 	std::vector<TrainRouteMetric *> metrics;
 	bool metrics_stale;
 	std::list<SequencePoint> sequence_points;
 	unsigned current_sequence;
-	bool sequence_check_pending;
 	Msp::Time::TimeDelta delay;
 	Msp::Time::TimeDelta duration;
 	Msp::RefPtr<TrainRoutePlanner> planner;
@@ -80,14 +90,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 +117,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 *> &, TrainRoutePlanner * = 0);
 	static void start_planning(Layout &);
+	static void apply_plan(Layout &, TrainRoutePlanner &);
 };
 
 } // namespace R2C2