Render tracks through GL::Objects

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

diff --git a/source/3d/tracktype.h b/source/3d/tracktype.h
index 56a4b46ac11c091e460fa8f075bb6f89203a8f96..3c06c58d8234047d7b198f2d0f9a68cfb1744f4a 100644 (file)
--- a/source/3d/tracktype.h
+++ b/source/3d/tracktype.h
@@ -1,47 +1,46 @@
 /* $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 MARKLIN3D_TRACKTYPE_H_
-#define MARKLIN3D_TRACKTYPE_H_
+#ifndef R2C2_3D_TRACKTYPE_H_
+#define R2C2_3D_TRACKTYPE_H_
 
 #include <msp/gl/mesh.h>
 #include <msp/gl/meshbuilder.h>
-#include <msp/gl/renderable.h>
-#include "libmarklin/profile.h"
-#include "libmarklin/tracktype.h"
+#include <msp/gl/object.h>
+#include "libr2c2/profile.h"
+#include "libr2c2/tracktype.h"
 
-namespace Marklin {
+namespace R2C2 {
 
 class Catalogue3D;
 
-class TrackType3D: public Msp::GL::Renderable
+class TrackType3D
 {
 private:
-       const Catalogue3D &catalogue;
-       Msp::GL::Mesh ballast_mesh;
-       Msp::GL::Mesh rail_mesh;
+       Catalogue3D &catalogue;
+       Msp::GL::Mesh mesh;
+       Msp::GL::Object object;
        std::vector<Msp::GL::Mesh *> path_meshes;
        std::vector<Point> border;
        float min_z;
        float max_z;
 
 public:
-       TrackType3D(const Catalogue3D &, const TrackType &);
+       TrackType3D(Catalogue3D &, const TrackType &);
        ~TrackType3D();
 
        void get_bounds(float, Point &, Point &) const;
+       const Msp::GL::Object &get_object() const { return object; }
        const Msp::GL::Mesh &get_path_mesh(unsigned) const;
 
-       virtual void render(const Msp::GL::Tag &) const;
-
 private:
        void build_part(const TrackPart &, const Profile &, const Point &, Msp::GL::MeshBuilder &, unsigned &);
 };
 
-} // namespace Marklin
+} // namespace R2C2
 
 #endif