X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fvehicle.h;h=919845403f6d54fba3117f3e6342ff674e3ad0c2;hb=d27013f6fa4a84cd088d9e7eb7901512304bbea3;hp=aa5042e4b73c3d2643c2850106ac8ab4a7c10eae;hpb=d15ac13f2e170f155b4bbd124df48400c339b644;p=r2c2.git

diff --git a/source/3d/vehicle.h b/source/3d/vehicle.h
index aa5042e..9198454 100644
--- a/source/3d/vehicle.h
+++ b/source/3d/vehicle.h
@@ -1,27 +1,22 @@
-#ifndef LIBR2C23D_VEHICLE_H_
-#define LIBR2C23D_VEHICLE_H_
+#ifndef R2C2_3D_VEHICLE_H_
+#define R2C2_3D_VEHICLE_H_
 
+#include <msp/gl/objectinstance.h>
 #include <msp/gl/renderable.h>
 #include "libr2c2/vehicle.h"
 #include "object.h"
 
 namespace R2C2 {
 
-class Axle3D;
-class Bogie3D;
-class Layout3D;
-class Rod3D;
+class VehiclePart3D;
 class VehicleType3D;
 
 class Vehicle3D: public Object3D, public Msp::GL::ObjectInstance
 {
 private:
-	Layout3D &layout;
 	Vehicle &vehicle;
 	const VehicleType3D &type;
-	std::vector<Axle3D *> axles;
-	std::vector<Bogie3D *> bogies;
-	std::vector<Rod3D *> rods;
+	std::vector<VehiclePart3D *> children;
 
 public:
 	Vehicle3D(Layout3D &, Vehicle &);
@@ -32,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;
 };