X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fvehicletype.h;h=72c2c231a1f84e24c57b45646f309b28125cdb5c;hb=7e27b311e33beda1746eb63e0945633f262427f6;hp=c5c491a7fe63c9973024b2aba908fd7c1670a306;hpb=7ff28ec88dedc3a2327feb4a507ae622cb953113;p=r2c2.git

diff --git a/source/3d/vehicletype.h b/source/3d/vehicletype.h
index c5c491a..72c2c23 100644
--- a/source/3d/vehicletype.h
+++ b/source/3d/vehicletype.h
@@ -1,30 +1,33 @@
 /* $Id$
 
-This file is part of the MSP Märklin suite
+This file is part of R²C²
 Copyright © 2010  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
-#ifndef LIBMARKLIN3D_VEHICLETYPE_H_
-#define LIBMARKLIN3D_VEHICLETYPE_H_
+#ifndef LIBR2C23D_VEHICLETYPE_H_
+#define LIBR2C23D_VEHICLETYPE_H_
 
 #include <msp/gl/mesh.h>
 #include <msp/gl/object.h>
-#include "libmarklin/vehicletype.h"
+#include "libr2c2/vehicletype.h"
 
-namespace Marklin {
+namespace R2C2 {
 
 class Catalogue3D;
 
 class VehicleType3D
 {
 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;
 
 public:
-	VehicleType3D(Catalogue3D &, const VehicleType &);
+	VehicleType3D(const Catalogue3D &, const VehicleType &);
 	~VehicleType3D();
 
 	const Msp::GL::Object *get_body_object() const { return body_object; }
@@ -33,8 +36,12 @@ public:
 	const Msp::GL::Object *get_bogie_axle_object(unsigned, unsigned) const;
 private:
 	Msp::GL::Object *get_object(const std::string &);
+	Msp::GL::Technique *create_technique(const std::map<std::string, std::string> &);
+	Msp::GL::Mesh *create_open_wagon(const std::map<std::string, std::string> &);
+	Msp::GL::Mesh *create_covered_wagon(const std::map<std::string, std::string> &);
+	Msp::GL::Mesh *create_flat_wagon(const std::map<std::string, std::string> &);
 };
 
-} // namespace Marklin
+} // namespace R2C2
 
 #endif