X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fvehicletype.h;h=428a372f58ca313a729df93c21e01ba60f0ef95e;hb=fa87851948ddc1908cfe6833aef08f582a7fb8fc;hp=f38f02d92ea43dab2651d8019884dccf1438e851;hpb=30df355287abd0bfe1189e616056335505287e9a;p=r2c2.git

diff --git a/source/3d/vehicletype.h b/source/3d/vehicletype.h
index f38f02d..428a372 100644
--- a/source/3d/vehicletype.h
+++ b/source/3d/vehicletype.h
@@ -1,39 +1,31 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
-#ifndef LIBMARKLIN3D_VEHICLETYPE_H_
-#define LIBMARKLIN3D_VEHICLETYPE_H_
+#ifndef R2C2_3D_VEHICLETYPE_H_
+#define R2C2_3D_VEHICLETYPE_H_
 
 #include <msp/gl/mesh.h>
 #include <msp/gl/object.h>
-#include "libmarklin/vehicletype.h"
-
-namespace Marklin {
+#include "libr2c2/vehicletype.h"
+#include "objecttype.h"
 
-class Catalogue3D;
+namespace R2C2 {
 
-class VehicleType3D
+class VehicleType3D: public ObjectType3D
 {
 private:
-	const Catalogue3D &catalogue;
 	const VehicleType &type;
 	std::map<std::string, Msp::GL::Object *> objects;
 	Msp::GL::Object *body_object;
 	std::vector<Msp::GL::Object *> bogie_objects;
-	std::vector<std::vector<Msp::GL::Object *> > axle_objects;
+	std::vector<Msp::GL::Object *> axle_objects;
+	std::vector<Msp::GL::Object *> rod_objects;
 
 public:
-	VehicleType3D(const Catalogue3D &, const VehicleType &);
+	VehicleType3D(Catalogue3D &, const VehicleType &);
 	~VehicleType3D();
 
 	const Msp::GL::Object *get_body_object() const { return body_object; }
 	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 &);
 	Msp::GL::Technique *create_technique(const std::map<std::string, std::string> &);
@@ -42,6 +34,6 @@ private:
 	Msp::GL::Mesh *create_flat_wagon(const std::map<std::string, std::string> &);
 };
 
-} // namespace Marklin
+} // namespace R2C2
 
 #endif