Simplify some interfaces by using track and block iterators

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

diff --git a/source/libr2c2/vehicle.h b/source/libr2c2/vehicle.h
index 8990a5b538d68c0f144b2404db636229ec6f9f00..d259201f0ec4df982fc353e005c1730f80d29e72 100644 (file)
--- a/source/libr2c2/vehicle.h
+++ b/source/libr2c2/vehicle.h
@@ -2,12 +2,13 @@
 #define LIBR2C2_VEHICLE_H_
 
 #include "geometry.h"
+#include "object.h"
+#include "trackiter.h"
 #include "vehicletype.h"
 
 namespace R2C2 {
 
 class Layout;
-class Track;
 
 class attachment_error: public std::logic_error
 {
@@ -17,7 +18,7 @@ public:
 };
 
 
-class Vehicle
+class Vehicle: public Object
 {
 public:
        enum PlaceMode
@@ -32,7 +33,7 @@ public:
        struct Axle
        {
                const VehicleType::Axle *type;
-               float angle;
+               Angle angle;
 
                Axle(const VehicleType::Axle &);
        };
@@ -40,7 +41,7 @@ public:
        struct Bogie
        {
                const VehicleType::Bogie *type;
-               float direction;
+               Angle direction;
                std::vector<Axle> axles;
 
                Bogie(const VehicleType::Bogie &);
@@ -50,7 +51,7 @@ public:
        {
                const VehicleType::Rod *type;
                Vector position;
-               float angle;
+               Angle angle;
 
                Rod(const VehicleType::Rod &);
        };
@@ -58,23 +59,19 @@ public:
 private:
        struct TrackPosition
        {
-               Track *track;
-               unsigned ep;
+               TrackIter track;
                float offs;
 
                TrackPosition();
-               TrackPosition(Track *, unsigned, float);
+               TrackPosition(const TrackIter &, float);
                void advance(float);
                TrackPoint get_point() const;
        };
 
-       Layout &layout;
        const VehicleType &type;
        Vehicle *next;
        Vehicle *prev;
        TrackPosition track_pos;
-       Vector position;
-       float direction;
        std::vector<Axle> axles;
        std::vector<Bogie> bogies;
        std::vector<Rod> rods;
@@ -85,7 +82,8 @@ public:
        Vehicle(Layout &, const VehicleType &);
        ~Vehicle();
 
-       const VehicleType &get_type() const { return type; }
+       virtual Vehicle *clone(Layout * = 0) const;
+       virtual const VehicleType &get_type() const { return type; }
 
        void attach_back(Vehicle &);
        void attach_front(Vehicle &);
@@ -94,14 +92,16 @@ public:
        Vehicle *get_next() const { return next; }
        Vehicle *get_previous() const { return prev; }
 
-       void place(Track &, unsigned, float, PlaceMode = CENTER);
+       // TODO implement these - should call place() with suitable parameters
+       virtual void set_position(const Vector &) { }
+       virtual void set_rotation(const Angle &) { }
+       void place(const TrackIter &, float, PlaceMode = CENTER);
        void unplace();
        void advance(float);
-       Track *get_track() const { return track_pos.track; }
-       unsigned get_entry() const { return track_pos.ep; }
+       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 Vector &get_position() const { return position; }
-       float get_direction() const { return direction; }
        const Axle &get_fixed_axle(unsigned) const;
        const Bogie &get_bogie(unsigned) const;
        const Axle &get_bogie_axle(unsigned, unsigned) const;
@@ -119,6 +119,13 @@ private:
        void adjust_for_distance(TrackPosition &, TrackPosition &, 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;
+
+public:
+       virtual unsigned get_n_link_slots() const;
+       virtual Vehicle *get_link(unsigned) const;
+       virtual int get_link_slot(const Object &) const;
+
+       virtual bool collide_ray(const Vector &, const Vector &) const { return false; }
 };
 
 } // namespace R2C2