X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Flayout.h;h=8e44fb52d26dc362a9258f50017d2e9fef1271de;hb=dda1e6c8716b6ac70d63a3f6ff95474a8b8b7336;hp=c32795594bd253b43d03299e0dfe2e30f3b74d81;hpb=2910db1364914c0ab98a0f80250cc39137821577;p=r2c2.git

diff --git a/source/libr2c2/layout.h b/source/libr2c2/layout.h
index c327955..8e44fb5 100644
--- a/source/libr2c2/layout.h
+++ b/source/libr2c2/layout.h
@@ -6,6 +6,7 @@
 #include <msp/datafile/objectloader.h>
 #include <msp/time/timestamp.h>
 #include "block.h"
+#include "geometry.h"
 
 namespace R2C2 {
 
@@ -16,7 +17,6 @@ class Route;
 class Signal;
 class Track;
 class Train;
-class Vector;
 class Vehicle;
 class Zone;
 
@@ -31,7 +31,6 @@ public:
 	public:
 		Loader(Layout &);
 	private:
-		virtual void finish();
 		void route();
 		void route(const std::string &);
 		void signal(ArticleNumber);
@@ -87,20 +86,20 @@ public:
 
 	void add_track(Track &);
 	const std::set<Track *> &get_tracks() const { return tracks; }
-	Track *pick_track(const Vector &, const Vector &);
+	Track *pick_track(const Ray &);
 	void remove_track(Track &);
 	unsigned allocate_turnout_id();
 
 	void add_signal(Signal &);
 	const std::set<Signal *> &get_signals() const { return signals; }
-	Signal *pick_signal(const Vector &, const Vector &);
+	Signal *pick_signal(const Ray &);
 	void remove_signal(Signal &);
 
-	Object *pick_object(const Vector &, const Vector &);
+	Object *pick_object(const Ray &);
 
 private:
 	template<typename T>
-	static T *pick(const std::set<T *> &, const Vector &, const Vector &);
+	static T *pick(const std::set<T *> &, const Ray &);
 
 public:
 	void add_block(Block &);