Clear the critical flag one track earlier

[r2c2.git] / source / 3d / vehicletype.h

diff --git a/source/3d/vehicletype.h b/source/3d/vehicletype.h
index c5c491a7fe63c9973024b2aba908fd7c1670a306..428a372f58ca313a729df93c21e01ba60f0ef95e 100644 (file)
--- a/source/3d/vehicletype.h
+++ b/source/3d/vehicletype.h
@@ -1,27 +1,22 @@
-/* $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 VehicleType &type;
        std::map<std::string, Msp::GL::Object *> objects;
        Msp::GL::Object *body_object;
        std::vector<Msp::GL::Object *> bogie_objects;
+       std::vector<Msp::GL::Object *> axle_objects;
+       std::vector<Msp::GL::Object *> rod_objects;
 
 public:
        VehicleType3D(Catalogue3D &, const VehicleType &);
@@ -30,11 +25,15 @@ public:
        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> &);
+       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