X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftracktype.h;h=a292e5532b625439de120555899ff3637391047b;hb=05afa986fa3d923a0ee239bb9200bdec7c6f1b5f;hp=d38f1b21b86d4f4fdac0f4e6f84d21804189c807;hpb=1ff06c5bc46a677fa389ef86c6b26664368f1653;p=r2c2.git

diff --git a/source/libr2c2/tracktype.h b/source/libr2c2/tracktype.h
index d38f1b2..a292e55 100644
--- a/source/libr2c2/tracktype.h
+++ b/source/libr2c2/tracktype.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_TRACKTYPE_H_
 #define LIBR2C2_TRACKTYPE_H_
 
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 #include "articlenumber.h"
 #include "geometry.h"
 #include "trackpart.h"
@@ -20,21 +13,25 @@ class TrackType
 public:
 	struct Endpoint
 	{
-		Point pos;
+		Vector pos;
 		float dir;  // Direction outwards from the endpoint
 		unsigned paths;
 
 		Endpoint(float, float, float, unsigned);
 	};
 
-	class Loader: public Msp::DataFile::BasicLoader<TrackType>
+	class Loader: public Msp::DataFile::ObjectLoader<TrackType>
 	{
+	private:
+		bool state_bits_set;
+
 	public:
 		Loader(TrackType &);
 	private:
 		virtual void finish();
 		void part();
 		void position(float, float, float);
+		void state_bits(unsigned);
 	};
 
 private:
@@ -42,8 +39,9 @@ private:
 	std::string description;
 	std::vector<TrackPart> parts;
 	std::vector<Endpoint> endpoints;
-	bool double_address;
+	unsigned state_bits;
 	unsigned autofit_preference;
+	std::string object;
 
 public:
 	TrackType(const ArticleNumber &);
@@ -54,14 +52,17 @@ public:
 	float get_path_length(int) const;
 	unsigned get_paths() const;
 	unsigned get_n_paths() const;
+	unsigned get_state_bits() const { return state_bits; }
 	bool is_turnout() const;
 	bool is_dead_end() const;
-	bool is_double_address() const { return double_address; }
 	unsigned get_autofit_preference() const { return autofit_preference; }
+	const std::string &get_object() const { return object; }
 	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;
 
 private:
 	void collect_endpoints();