X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fvehicletype.h;h=428a372f58ca313a729df93c21e01ba60f0ef95e;hb=7b4155fa0581d7c5fe198e4fb1dea61fa0846eec;hp=b779fa4292445c184f8e432cc05ff759be51635a;hpb=d15ac13f2e170f155b4bbd124df48400c339b644;p=r2c2.git diff --git a/source/3d/vehicletype.h b/source/3d/vehicletype.h index b779fa4..428a372 100644 --- a/source/3d/vehicletype.h +++ b/source/3d/vehicletype.h @@ -1,23 +1,21 @@ -#ifndef LIBR2C23D_VEHICLETYPE_H_ -#define LIBR2C23D_VEHICLETYPE_H_ +#ifndef R2C2_3D_VEHICLETYPE_H_ +#define R2C2_3D_VEHICLETYPE_H_ #include #include #include "libr2c2/vehicletype.h" +#include "objecttype.h" namespace R2C2 { -class Catalogue3D; - -class VehicleType3D +class VehicleType3D: public ObjectType3D { private: - Catalogue3D &catalogue; const VehicleType &type; std::map objects; Msp::GL::Object *body_object; std::vector bogie_objects; - std::vector > axle_objects; + std::vector axle_objects; std::vector rod_objects; public: @@ -25,9 +23,8 @@ public: ~VehicleType3D(); const Msp::GL::Object *get_body_object() const { return body_object; } - const Msp::GL::Object *get_fixed_axle_object(unsigned) const; + const Msp::GL::Object *get_axle_object(unsigned) const; const Msp::GL::Object *get_bogie_object(unsigned) const; - const Msp::GL::Object *get_bogie_axle_object(unsigned, unsigned) const; const Msp::GL::Object *get_rod_object(unsigned) const; private: Msp::GL::Object *get_object(const std::string &);