Use generic ObjectTypes in Catalogue

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

diff --git a/source/3d/vehicletype.h b/source/3d/vehicletype.h
index 81a6468b81622470a5605f87f86e71a7f2a0df6e..02d110887a6b729f94f2930b1d86f0dbbf94e107 100644 (file)
--- a/source/3d/vehicletype.h
+++ b/source/3d/vehicletype.h
@@ -4,15 +4,13 @@
 #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;