X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftracktype.cpp;h=23c636c6d1cd1689d4a809c7fb23f3929f27c6b7;hb=4086edbfae9a04da491cdb349a3bef6af5c132d9;hp=b6971ca92175badf5cbddbcf772c9a785bc04140;hpb=d15ac13f2e170f155b4bbd124df48400c339b644;p=r2c2.git

diff --git a/source/libr2c2/tracktype.cpp b/source/libr2c2/tracktype.cpp
index b6971ca..23c636c 100644
--- a/source/libr2c2/tracktype.cpp
+++ b/source/libr2c2/tracktype.cpp
@@ -55,7 +55,7 @@ bool TrackType::is_dead_end() const
 const TrackType::Endpoint &TrackType::get_endpoint(unsigned i) const
 {
 	if(i>=endpoints.size())
-		throw InvalidParameterValue("Endpoint index out of range");
+		throw out_of_range("TrackType::get_endpoint");
 
 	return endpoints[i];
 }
@@ -63,7 +63,7 @@ const TrackType::Endpoint &TrackType::get_endpoint(unsigned i) const
 TrackPoint TrackType::get_point(unsigned epi, unsigned path, float d) const
 {
 	if(epi>=endpoints.size())
-		throw InvalidParameterValue("Endpoint index out of range");
+		throw out_of_range("TrackType::get_point");
 
 	const TrackPart *part = 0;
 	unsigned part_ep = 0;
@@ -87,7 +87,7 @@ TrackPoint TrackType::get_point(unsigned epi, unsigned path, float d) const
 	}
 
 	if(!part)
-		throw Exception("Internal error (endpoint does not match any part)");
+		throw logic_error("internal error (endpoint does not match any part)");
 
 	while(1)
 	{
@@ -106,13 +106,32 @@ TrackPoint TrackType::get_point(unsigned epi, unsigned path, float d) const
 			d -= plen;
 			TrackPart *next = part->get_link(1-part_ep);
 			if(!next)
-				throw InvalidParameterValue("Distance out of range");
+				throw invalid_argument("TrackType::get_point");
 			part_ep = (next->get_link(0)==part ? 0 : 1);
 			part = next;
 		}
 	}
 }
 
+TrackPoint TrackType::get_nearest_point(const Vector &p) const
+{
+	TrackPoint result;
+	float dist = -1;
+
+	for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
+	{
+		TrackPoint n = i->get_nearest_point(p);
+		float d = distance(n.pos, p);
+		if(d<dist || dist<0)
+		{
+			result = n;
+			dist = d;
+		}
+	}
+
+	return result;
+}
+
 bool TrackType::collide_ray(const Vector &start, const Vector &dir, float width) const
 {
 	for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
@@ -173,7 +192,7 @@ TrackType::Endpoint::Endpoint(float x, float y, float d, unsigned p):
 
 
 TrackType::Loader::Loader(TrackType &t):
-	Msp::DataFile::BasicLoader<TrackType>(t),
+	Msp::DataFile::ObjectLoader<TrackType>(t),
 	state_bits_set(false)
 {
 	add("autofit_preference", &TrackType::autofit_preference);