BasicLoader is now called ObjectLoader

[r2c2.git] / source / libr2c2 / tracktype.h

diff --git a/source/libr2c2/tracktype.h b/source/libr2c2/tracktype.h
index fb40ac9473708623c3560ac586f4b79a8557902b..1b1c78ce998de86b736d252774643bce2346bfba 100644 (file)
--- 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,14 +13,14 @@ 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;
@@ -48,6 +41,7 @@ private:
        std::vector<Endpoint> endpoints;
        unsigned state_bits;
        unsigned autofit_preference;
+       std::string object;
 
 public:
        TrackType(const ArticleNumber &);
@@ -62,10 +56,12 @@ public:
        bool is_turnout() const;
        bool is_dead_end() const;
        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;
+       bool collide_ray(const Vector &, const Vector &, float) const;
 
 private:
        void collect_endpoints();