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

diff --git a/source/3d/vehicle.h b/source/3d/vehicle.h
index 075eaef..aa5042e 100644
--- a/source/3d/vehicle.h
+++ b/source/3d/vehicle.h
@@ -1,41 +1,42 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
-#ifndef LIBMARKLIN3D_VEHICLE_H_
-#define LIBMARKLIN3D_VEHICLE_H_
+#ifndef LIBR2C23D_VEHICLE_H_
+#define LIBR2C23D_VEHICLE_H_
 
 #include <msp/gl/renderable.h>
-#include "libmarklin/vehicle.h"
+#include "libr2c2/vehicle.h"
 #include "object.h"
 
-namespace Marklin {
+namespace R2C2 {
 
+class Axle3D;
+class Bogie3D;
 class Layout3D;
+class Rod3D;
 class VehicleType3D;
 
-class Vehicle3D: public Object3D, public Msp::GL::Renderable
+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;
 
 public:
 	Vehicle3D(Layout3D &, Vehicle &);
 	~Vehicle3D();
 
 	Vehicle &get_vehicle() const { return vehicle; }
+	const VehicleType3D &get_type() const { return type; }
 
-	virtual Point get_node() const;
+	virtual Vector get_node() const;
 	virtual bool is_visible() const;
 
-	virtual void render(const Msp::GL::Tag &) const;
+	virtual void render(Msp::GL::Renderer &, const Msp::GL::Tag &) const;
+	virtual void setup_render(Msp::GL::Renderer &, const Msp::GL::Tag &) const;
 };
 
-} // namespace Marklin
+} // namespace R2C2
 
 #endif