Move Endpoint inside TrackType

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

diff --git a/source/libmarklin/tracktype.h b/source/libmarklin/tracktype.h
index 45d8720bd4ae02da8d72f5fc299063017e8302ff..902a2f6ddd561df38ecb1c84dbdfbb0fb3d2c79b 100644 (file)
--- a/source/libmarklin/tracktype.h
+++ b/source/libmarklin/tracktype.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2006-2009  Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -9,7 +9,7 @@ Distributed under the GPL
 #define LIBMARKLIN_TRACKTYPE_H_
 
 #include <msp/datafile/loader.h>
-#include "endpoint.h"
+#include "geometry.h"
 #include "trackpart.h"
 
 namespace Marklin {
@@ -17,6 +17,15 @@ namespace Marklin {
 class TrackType
 {
 public:
+       struct Endpoint
+       {
+               Point pos;
+               float dir;  // Direction outwards from the endpoint
+               unsigned paths;
+
+               Endpoint(float, float, float, unsigned);
+       };
+
        class Loader: public Msp::DataFile::BasicLoader<TrackType>
        {
        public:
@@ -32,6 +41,7 @@ private:
        std::string description;
        std::vector<TrackPart> parts;
        std::vector<Endpoint> endpoints;
+       bool double_address;
 
 public:
        TrackType(unsigned);
@@ -40,9 +50,14 @@ public:
        const std::string &get_description() const { return description; }
        float get_total_length() const;
        float get_path_length(int) const;
+       unsigned get_paths() const;
        unsigned get_n_paths() const;
+       bool is_turnout() const;
+       bool is_dead_end() const;
+       bool is_double_address() const { return double_address; }
        const std::vector<TrackPart> &get_parts() const { return parts; }
        const std::vector<Endpoint> &get_endpoints() const { return endpoints; }
+       TrackPoint get_point(unsigned, unsigned, float) const;
 
 private:
        void collect_endpoints();