X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrack.h;h=e1349a1ff8be919f7fced788ce823227dfa7f4c0;hb=4481da8b54bba32b338befd509360816b08402e5;hp=b8a9a3d330bc6f472818f24a006266e111c9552b;hpb=b88d3630a0e3fdd763db018bbe5dbfe3180a95f2;p=r2c2.git

diff --git a/source/libr2c2/track.h b/source/libr2c2/track.h
index b8a9a3d..e1349a1 100644
--- a/source/libr2c2/track.h
+++ b/source/libr2c2/track.h
@@ -29,6 +29,7 @@ public:
 	};
 
 	sigc::signal<void, unsigned, Track *> signal_link_changed;
+	sigc::signal<void, unsigned> signal_path_changing;
 	sigc::signal<void, unsigned> signal_path_changed;
 
 private:
@@ -54,13 +55,15 @@ public:
 	void set_block(Block *);
 	Block &get_block() const;
 	virtual void set_position(const Vector &);
-	virtual void set_rotation(float);
+	virtual void set_rotation(const Angle &);
 	void set_slope(float);
 	void set_flex(bool);
 	float get_slope() const { return slope; }
 	bool get_flex() const { return flex; }
+private:
 	void check_slope();
 
+public:
 	void set_turnout_id(unsigned);
 	void set_sensor_id(unsigned);
 	unsigned get_turnout_id() const { return turnout_id; }
@@ -69,12 +72,6 @@ public:
 	unsigned get_active_path() const { return active_path; }
 	bool is_path_changing() const { return path_changing; }
 
-	int get_endpoint_by_link(Track &) const;
-	bool snap_to(Track &, bool, float = 0);
-	void break_link(Track &);
-	void break_links();
-	const std::vector<Track *> &get_links() const { return links; }
-	Track *get_link(unsigned) const;
 	TrackPoint get_point(unsigned, unsigned, float) const;
 	TrackPoint get_point(unsigned, float) const;
 
@@ -85,7 +82,13 @@ private:
 	virtual SnapType get_default_snap_type_to(const Object &) const;
 
 public:
-	virtual bool collide_ray(const Vector &, const Vector &) const;
+	virtual unsigned get_n_link_slots() const;
+	virtual Track *get_link(unsigned) const;
+	const std::vector<Track *> &get_links() const { return links; }
+	virtual int get_link_slot(const Object &) const;
+	virtual bool link_to(Object &);
+	using Object::break_link;
+	virtual bool break_link(unsigned);
 
 	void save(std::list<Msp::DataFile::Statement> &) const;
 private: