Rename Point to Vector

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

diff --git a/source/libr2c2/vehicle.h b/source/libr2c2/vehicle.h
index 2e91962842f2d319153ea4e8a2592f9f7af2275b..b9c36d95d1e42bdbd6b06b5bc655138ac8ab3fb2 100644 (file)
--- a/source/libr2c2/vehicle.h
+++ b/source/libr2c2/vehicle.h
@@ -9,12 +9,12 @@ Distributed under the GPL
 #define LIBR2C2_VEHICLE_H_
 
 #include "geometry.h"
+#include "vehicletype.h"
 
 namespace R2C2 {
 
 class Layout;
 class Track;
-class VehicleType;
 
 class Vehicle
 {
@@ -28,6 +28,32 @@ public:
                BACK_BUFFER
        };
 
+       struct Axle
+       {
+               const VehicleType::Axle *type;
+               float angle;
+
+               Axle(const VehicleType::Axle &);
+       };
+
+       struct Bogie
+       {
+               const VehicleType::Bogie *type;
+               float direction;
+               std::vector<Axle> axles;
+
+               Bogie(const VehicleType::Bogie &);
+       };
+
+       struct Rod
+       {
+               const VehicleType::Rod *type;
+               Vector position;
+               float angle;
+
+               Rod(const VehicleType::Rod &);
+       };
+
 private:
        struct TrackPosition
        {
@@ -41,23 +67,15 @@ private:
                TrackPoint get_point() const;
        };
 
-       struct Rod
-       {
-               Point position;
-               float angle;
-
-               Rod();
-       };
-
        Layout &layout;
        const VehicleType &type;
        Vehicle *next;
        Vehicle *prev;
        TrackPosition track_pos;
-       Point position;
+       Vector position;
        float direction;
-       std::vector<float> bogie_dirs;
-       std::vector<std::vector<float> > axle_angles;
+       std::vector<Axle> axles;
+       std::vector<Bogie> bogies;
        std::vector<Rod> rods;
        unsigned front_sensor;
        unsigned back_sensor;
@@ -81,13 +99,12 @@ public:
        Track *get_track() const { return track_pos.track; }
        unsigned get_entry() const { return track_pos.ep; }
        float get_offset() const { return track_pos.offs; }
-       const Point &get_position() const { return position; }
+       const Vector &get_position() const { return position; }
        float get_direction() const { return direction; }
-       float get_axle_angle(unsigned) const;
-       float get_bogie_direction(unsigned) const;
-       float get_bogie_axle_angle(unsigned, unsigned) const;
-       const Point &get_rod_position(unsigned) const;
-       float get_rod_angle(unsigned) const;
+       const Axle &get_axle(unsigned) const;
+       const Bogie &get_bogie(unsigned) const;
+       const Axle &get_bogie_axle(unsigned, unsigned) const;
+       const Rod &get_rod(unsigned) const;
 private:
        void update_position();
        void update_position_from(const Vehicle &);
@@ -99,7 +116,7 @@ private:
        void update_rods();
 
        void adjust_for_distance(TrackPosition &, TrackPosition &, float, float = 0.5) const;
-       TrackPoint get_point(const Point &, const Point &, 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;
 };