Move Endpoint inside TrackType

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

diff --git a/source/libmarklin/tracktype.h b/source/libmarklin/tracktype.h
index 99989be664ae15e7ba3f14dd64be865b8da186e5..902a2f6ddd561df38ecb1c84dbdfbb0fb3d2c79b 100644 (file)
--- a/source/libmarklin/tracktype.h
+++ b/source/libmarklin/tracktype.h
@@ -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: