X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Flibr2c2%2Ftrackpart.cpp;h=8c0c2d0038fdf3a6cf7c1a50b0f747c46cf95208;hb=64340dad429ba4040538fc06b6882aabdb489925;hp=f677c703ee5a7e89f7ffa9d241fbaa69754f433c;hpb=f8a7788cee0261babfc4c804a58515aad6dfbc3d;p=r2c2.git

diff --git a/source/libr2c2/trackpart.cpp b/source/libr2c2/trackpart.cpp
index f677c70..8c0c2d0 100644
--- a/source/libr2c2/trackpart.cpp
+++ b/source/libr2c2/trackpart.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <cmath>
 #include "trackpart.h"
 
@@ -88,13 +81,40 @@ void TrackPart::check_link(TrackPart &other)
 TrackPart *TrackPart::get_link(unsigned i) const
 {
 	if(i>=2)
-		throw InvalidParameterValue("Index out of range");
+		throw out_of_range("TrackPart::get_link");
 	return links[i];
 }
 
+bool TrackPart::collide_ray(const Vector &start, const Vector &ray, float width) const
+{
+	Vector local_start(start.x-pos.x, start.y-pos.y, start.z);
+	float c = cos(dir);
+	float s = sin(dir);
+	local_start = Vector(c*local_start.x+s*local_start.y, c*local_start.y-s*local_start.x, local_start.z);
+	Vector local_ray(c*ray.x+s*ray.y, c*ray.y-s*ray.x, ray.z);
+
+	float d = -local_start.z/local_ray.z;
+	if(d<0)
+		return false;
+
+	Vector base(local_start.x+d*local_ray.x, local_start.y+d*local_ray.y);
+
+	if(radius)
+	{
+		base.y -= radius;
+		if(radius<0)
+			base.y = -base.y;
+		float r = sqrt(base.x*base.x+base.y*base.y)-abs(radius);
+		float a = atan2(base.x, -base.y);
+		return (a>=0 && a<=length && r>=-width/2 && r<=width/2);
+	}
+	else
+		return (base.x>=0 && base.x<=length && base.y>=-width/2 && base.y<=width/2);
+}
+
 
 TrackPart::Loader::Loader(TrackPart &p):
-	Msp::DataFile::BasicLoader<TrackPart>(p)
+	Msp::DataFile::ObjectLoader<TrackPart>(p)
 {
 	add("start",    &Loader::start);
 	add("length",   &TrackPart::length);