X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrackpart.h;h=787a6ca5777bd4543d53c16d82992cda0f1fc6a9;hb=d0af7846e05691d65d8021e46c8f81e8ca05199a;hp=0a07b4d0df857fabb90679e45f0582a05f4fb74d;hpb=1ff06c5bc46a677fa389ef86c6b26664368f1653;p=r2c2.git

diff --git a/source/libr2c2/trackpart.h b/source/libr2c2/trackpart.h
index 0a07b4d..787a6ca 100644
--- a/source/libr2c2/trackpart.h
+++ b/source/libr2c2/trackpart.h
@@ -1,14 +1,7 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #ifndef LIBR2C2_TRACKPART_H_
 #define LIBR2C2_TRACKPART_H_
 
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 #include "geometry.h"
 
 namespace R2C2 {
@@ -16,7 +9,7 @@ namespace R2C2 {
 class TrackPart
 {
 public:
-	class Loader: public Msp::DataFile::BasicLoader<TrackPart>
+	class Loader: public Msp::DataFile::ObjectLoader<TrackPart>
 	{
 	public:
 		Loader(TrackPart &);
@@ -26,7 +19,7 @@ public:
 	};
 
 private:
-	Point pos;
+	Vector pos;
 	float dir;
 	float length;
 	float radius;
@@ -40,10 +33,12 @@ public:
 	float get_length() const;
 	bool is_curved() const { return radius; }
 	TrackPoint get_point(float) const;
+	TrackPoint get_nearest_point(const Vector &) const;
 	unsigned get_path() const { return path; }
 	bool is_dead_end() const { return dead_end; }
 	void check_link(TrackPart &);
 	TrackPart *get_link(unsigned) const;
+	bool collide_ray(const Vector &, const Vector &, float) const;
 };
 
 } // namespace R2C2