X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrack.cpp;h=d4e9d12d8ef7b08682f0f9c97d5f4cb36a3cce38;hb=c3cdedda4cec4443e144710af76a190979b4d3c8;hp=2cb95186e6f32237a61b16e092a5eac279a7ba13;hpb=621c5c938d70ba0d155e0eda91a708db0a52c0dc;p=r2c2.git

diff --git a/source/libr2c2/track.cpp b/source/libr2c2/track.cpp
index 2cb9518..d4e9d12 100644
--- a/source/libr2c2/track.cpp
+++ b/source/libr2c2/track.cpp
@@ -21,7 +21,8 @@ Track::Track(Layout &l, const TrackType &t):
 	turnout_id(0),
 	sensor_id(0),
 	links(type.get_endpoints().size()),
-	active_path(0)
+	active_path(0),
+	path_changing(false)
 {
 	if(type.is_turnout())
 		turnout_id = layout.allocate_turnout_id();
@@ -143,6 +144,7 @@ void Track::set_active_path(unsigned p)
 	if(!(type.get_paths()&(1<<p)))
 		throw invalid_argument("Track::set_active_path");
 
+	path_changing = true;
 	layout.get_driver().set_turnout(turnout_id, p);
 }
 
@@ -288,7 +290,7 @@ void Track::break_links()
 
 Track *Track::get_link(unsigned i) const
 {
-	if(i>links.size())
+	if(i>=links.size())
 		throw out_of_range("Track::get_link");
 
 	return links[i];
@@ -326,6 +328,19 @@ TrackPoint Track::get_point(unsigned epi, float d) const
 	return get_point(epi, active_path, d);
 }
 
+TrackPoint Track::get_nearest_point(const Vector &p) const
+{
+	Vector local(p.x-pos.x, p.y-pos.y, p.z-pos.z);
+	float c = cos(rot);
+	float s = sin(rot);
+	local = Vector(c*local.x+s*local.y, c*local.y-s*local.x, local.z);
+
+	TrackPoint tp = type.get_nearest_point(local);
+	tp.pos = Vector(pos.x+tp.pos.x*c-tp.pos.y*s, pos.y+tp.pos.y*c+tp.pos.x*s, pos.z+tp.pos.z);
+	tp.dir += rot;
+	return tp;
+}
+
 bool Track::collide_ray(const Vector &start, const Vector &ray)
 {
 	Vector local_start(start.x-pos.x, start.y-pos.y, start.z-pos.z);
@@ -360,13 +375,14 @@ void Track::turnout_event(unsigned addr, unsigned state)
 	if(addr==turnout_id)
 	{
 		active_path = state;
+		path_changing = false;
 		signal_path_changed.emit(active_path);
 	}
 }
 
 
 Track::Loader::Loader(Track &t):
-	DataFile::BasicLoader<Track>(t)
+	DataFile::ObjectLoader<Track>(t)
 {
 	add("position",   &Loader::position);
 	add("rotation",   &Track::rot);