X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fvehicletype.h;h=a12d3f4f1ea1b4cc513cad45ecbcbfe64cb9e586;hb=ce8be590703fdc0709863f0ee9695f40b6adb200;hp=c0fe0ea5136f3c56bf7a94a6089fe2cc7db64a88;hpb=37af7970d9cefcf40ae58ca06ca8469f56b0cc13;p=r2c2.git diff --git a/source/libr2c2/vehicletype.h b/source/libr2c2/vehicletype.h index c0fe0ea..a12d3f4 100644 --- a/source/libr2c2/vehicletype.h +++ b/source/libr2c2/vehicletype.h @@ -53,6 +53,8 @@ public: Axle(); }; + typedef std::vector AxleArray; + struct Bogie { class Loader: public Msp::DataFile::ObjectLoader @@ -65,13 +67,15 @@ public: }; float position; - std::vector axles; + AxleArray axles; std::string object; bool rotate_object; Bogie(); }; + typedef std::vector BogieArray; + struct Rod { enum Anchor @@ -123,6 +127,8 @@ public: Rod(); }; + typedef std::vector RodArray; + private: ArticleNumber art_nr; std::string name; @@ -131,9 +137,9 @@ private: float length; float width; float height; - std::vector axles; - std::vector bogies; - std::vector rods; + AxleArray axles; + BogieArray bogies; + RodArray rods; std::string object; public: @@ -147,9 +153,13 @@ public: float get_length() const { return length; } float get_width() const { return width; } float get_height() const { return height; } - const std::vector &get_axles() const { return axles; } - const std::vector &get_bogies() const { return bogies; } - const std::vector &get_rods() const { return rods; } + const AxleArray &get_axles() const { return axles; } + const Axle &get_axle(unsigned) const; + const BogieArray &get_bogies() const { return bogies; } + const Bogie &get_bogie(unsigned) const; + const Axle &get_bogie_axle(unsigned, unsigned) const; + const RodArray &get_rods() const { return rods; } + const Rod &get_rod(unsigned) const; float get_front_axle_offset() const; float get_back_axle_offset() const; const std::string &get_object() const { return object; }