Avoid nested block reservations completely

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

diff --git a/source/3d/tracktype.h b/source/3d/tracktype.h
index 27bf7fe97723ec8e9e0c39d2f4b63ade8bcd0c89..3923ab1ac35f28d2835c04b8ed7189d597023875 100644 (file)
--- a/source/3d/tracktype.h
+++ b/source/3d/tracktype.h
@@ -7,15 +7,13 @@
 #include <msp/gl/object.h>
 #include "libr2c2/profile.h"
 #include "libr2c2/tracktype.h"
+#include "objecttype.h"
 
 namespace R2C2 {
 
-class Catalogue3D;
-
-class TrackType3D
+class TrackType3D: public ObjectType3D
 {
 private:
-       Catalogue3D &catalogue;
        Msp::GL::Mesh *mesh;
        Msp::GL::Object *object;
        bool own_data;
@@ -30,6 +28,7 @@ public:
 
 private:
        void build_part(const TrackPart &, const Profile &, const Vector &, bool, Msp::GL::MeshBuilder &, unsigned &);
+       void build_ties(const TrackPart &, const Profile &, float, float, const Vector &, Msp::GL::MeshBuilder &, unsigned &);
 };
 
 } // namespace R2C2