X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fvehicle.h;fp=source%2F3d%2Fvehicle.h;h=27b16155f83eff7ea2041131205223613a386c80;hb=b0d402f30489b0618d21281781e1b8f683ed567b;hp=4b145536f724f566e4e41d9919f201659c1f2ff6;hpb=d41f66805bc9fe0b33e3d46b47f52e67b5782028;p=r2c2.git diff --git a/source/3d/vehicle.h b/source/3d/vehicle.h index 4b14553..27b1615 100644 --- a/source/3d/vehicle.h +++ b/source/3d/vehicle.h @@ -1,15 +1,14 @@ #ifndef LIBR2C23D_VEHICLE_H_ #define LIBR2C23D_VEHICLE_H_ +#include #include #include "libr2c2/vehicle.h" #include "object.h" namespace R2C2 { -class Axle3D; -class Bogie3D; -class Rod3D; +class VehiclePart3D; class VehicleType3D; class Vehicle3D: public Object3D, public Msp::GL::ObjectInstance @@ -17,9 +16,7 @@ class Vehicle3D: public Object3D, public Msp::GL::ObjectInstance private: Vehicle &vehicle; const VehicleType3D &type; - std::vector axles; - std::vector bogies; - std::vector rods; + std::vector children; public: Vehicle3D(Layout3D &, Vehicle &); @@ -30,7 +27,10 @@ public: virtual Vector get_node() const; virtual bool is_visible() const; +private: + virtual void moved(); +public: virtual void render(Msp::GL::Renderer &, const Msp::GL::Tag &) const; virtual void setup_render(Msp::GL::Renderer &, const Msp::GL::Tag &) const; };