X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftracktype.h;h=64efe8c1907f27541d08af89a2898aa4c02040ac;hb=d405b9943c888e3945c7ea4e496f9d300b114fe0;hp=a292e5532b625439de120555899ff3637391047b;hpb=e75f12451201fb6540ad2155e8796c2b5aee8d4c;p=r2c2.git

diff --git a/source/libr2c2/tracktype.h b/source/libr2c2/tracktype.h
index a292e55..64efe8c 100644
--- a/source/libr2c2/tracktype.h
+++ b/source/libr2c2/tracktype.h
@@ -4,23 +4,29 @@
 #include <msp/datafile/objectloader.h>
 #include "articlenumber.h"
 #include "geometry.h"
+#include "objecttype.h"
 #include "trackpart.h"
 
 namespace R2C2 {
 
-class TrackType
+class TrackAppearance;
+
+class TrackType: public ObjectType
 {
 public:
 	struct Endpoint
 	{
 		Vector pos;
-		float dir;  // Direction outwards from the endpoint
+		Angle dir;  // Direction outwards from the endpoint
 		unsigned paths;
 
-		Endpoint(float, float, float, unsigned);
+		Endpoint(float, float, const Angle &, unsigned);
+
+		bool has_path(unsigned p) const { return paths&(1<<p); }
+		bool has_common_paths(const Endpoint &e) const { return paths&e.paths; }
 	};
 
-	class Loader: public Msp::DataFile::ObjectLoader<TrackType>
+	class Loader: public Msp::DataFile::DerivedObjectLoader<TrackType, ObjectType::Loader>
 	{
 	private:
 		bool state_bits_set;
@@ -35,8 +41,7 @@ public:
 	};
 
 private:
-	ArticleNumber art_nr;
-	std::string description;
+	const TrackAppearance &appearance;
 	std::vector<TrackPart> parts;
 	std::vector<Endpoint> endpoints;
 	unsigned state_bits;
@@ -44,10 +49,9 @@ private:
 	std::string object;
 
 public:
-	TrackType(const ArticleNumber &);
+	TrackType(const ArticleNumber &, const TrackAppearance &);
 
-	const ArticleNumber &get_article_number() const { return art_nr; }
-	const std::string &get_description() const { return description; }
+	const TrackAppearance &get_appearance() const { return appearance; }
 	float get_total_length() const;
 	float get_path_length(int) const;
 	unsigned get_paths() const;
@@ -60,9 +64,8 @@ public:
 	const std::vector<TrackPart> &get_parts() const { return parts; }
 	const std::vector<Endpoint> &get_endpoints() const { return endpoints; }
 	const Endpoint &get_endpoint(unsigned) const;
-	TrackPoint get_point(unsigned, unsigned, float) const;
-	TrackPoint get_nearest_point(const Vector &) const;
-	bool collide_ray(const Vector &, const Vector &, float) const;
+	OrientedPoint get_point(unsigned, unsigned, float) const;
+	OrientedPoint get_nearest_point(const Vector &) const;
 
 private:
 	void collect_endpoints();