Create another track iterator class that holds an offset as well

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

diff --git a/source/libr2c2/vehicle.h b/source/libr2c2/vehicle.h
index 94ae2b1683e648cc8f07cb9edfc1ff56d107ecdf..5095a2812a9d02c587748d58b49de8292d4fd96b 100644 (file)
--- a/source/libr2c2/vehicle.h
+++ b/source/libr2c2/vehicle.h
@@ -3,7 +3,7 @@
 
 #include "geometry.h"
 #include "object.h"
-#include "trackiter.h"
+#include "trackoffsetiter.h"
 #include "vehicletype.h"
 
 namespace R2C2 {
@@ -58,22 +58,11 @@ public:
        };
 
 private:
-       struct TrackPosition
-       {
-               TrackIter track;
-               float offs;
-
-               TrackPosition();
-               TrackPosition(const TrackIter &, float);
-               void advance(float);
-               TrackPoint get_point() const;
-       };
-
        const VehicleType &type;
        Train *train;
        Vehicle *next;
        Vehicle *prev;
-       TrackPosition track_pos;
+       TrackOffsetIter track;
        std::vector<Axle> axles;
        std::vector<Bogie> bogies;
        std::vector<Rod> rods;
@@ -103,10 +92,10 @@ public:
        void place(const TrackIter &, float, PlaceMode = CENTER);
        void unplace();
        void advance(float);
-       const TrackIter &get_track_iter() const { return track_pos.track; }
-       Track *get_track() const { return track_pos.track.track(); }
-       unsigned get_entry() const { return track_pos.track.entry(); }
-       float get_offset() const { return track_pos.offs; }
+       const TrackOffsetIter &get_track_iter() const { return track; }
+       Track *get_track() const { return track.track(); }
+       unsigned get_entry() const { return track.entry(); }
+       float get_offset() const { return track.offset(); }
        const Axle &get_fixed_axle(unsigned) const;
        const Bogie &get_bogie(unsigned) const;
        const Axle &get_bogie_axle(unsigned, unsigned) const;
@@ -121,9 +110,9 @@ private:
        void turn_axles(float);
        void update_rods();
 
-       void adjust_for_distance(TrackPosition &, TrackPosition &, float, float = 0.5) const;
+       void adjust_for_distance(TrackOffsetIter &, TrackOffsetIter &, float, float = 0.5) const;
        TrackPoint get_point(const Vector &, const Vector &, float = 0.5) const;
-       TrackPoint get_point(const TrackPosition &, float, float = 0.5) const;
+       TrackPoint get_point(const TrackOffsetIter &, float, float = 0.5) const;
 
 public:
        virtual unsigned get_n_link_slots() const;