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

diff --git a/source/libr2c2/track.cpp b/source/libr2c2/track.cpp
index 2cb9518..540c247 100644
--- a/source/libr2c2/track.cpp
+++ b/source/libr2c2/track.cpp
@@ -288,7 +288,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 +326,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);
@@ -366,7 +379,7 @@ void Track::turnout_event(unsigned addr, unsigned state)
 
 
 Track::Loader::Loader(Track &t):
-	DataFile::BasicLoader<Track>(t)
+	DataFile::ObjectLoader<Track>(t)
 {
 	add("position",   &Loader::position);
 	add("rotation",   &Track::rot);