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

diff --git a/source/3d/vehicletype.h b/source/3d/vehicletype.h
index f65a1d6..428a372 100644
--- a/source/3d/vehicletype.h
+++ b/source/3d/vehicletype.h
@@ -1,30 +1,21 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2010-2011  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
-#ifndef LIBR2C23D_VEHICLETYPE_H_
-#define LIBR2C23D_VEHICLETYPE_H_
+#ifndef R2C2_3D_VEHICLETYPE_H_
+#define R2C2_3D_VEHICLETYPE_H_
 
 #include <msp/gl/mesh.h>
 #include <msp/gl/object.h>
 #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<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:
@@ -32,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 &);