Use GL::Renderables and a Pipeline for rendering

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

diff --git a/source/3d/catalogue.h b/source/3d/catalogue.h
index 689756d1b59775ad03e757b2b01101311922b4cf..b27683c18a820fd3a7b5dcc05b0fc50194b5d04a 100644 (file)
--- a/source/3d/catalogue.h
+++ b/source/3d/catalogue.h
@@ -9,6 +9,7 @@ Distributed under the GPL
 #define MARKLIN3D_CATALOGUE_H_
 
 #include <msp/gl/material.h>
+#include <msp/gl/mesh.h>
 #include "libmarklin/catalogue.h"
 
 namespace Marklin {
@@ -20,13 +21,20 @@ class Catalogue3D
 private:
        const Catalogue &catalogue;
        std::map<const TrackType *, TrackType3D *> tracks;
-       Msp::GL::Material *ballast_material;
+       Msp::GL::Material ballast_material;
+       Msp::GL::Material rail_material;
+       Msp::GL::Mesh endpoint_mesh;
 
 public:
        Catalogue3D(const Catalogue &);
 
        const Catalogue &get_catalogue() const { return catalogue; }
        const TrackType3D &get_track(const TrackType &) const;
+       const Msp::GL::Material &get_ballast_material() const { return ballast_material; }
+       const Msp::GL::Material &get_rail_material() const { return rail_material; }
+       const Msp::GL::Mesh &get_endpoint_mesh() const { return endpoint_mesh; }
+private:
+       void build_endpoint_mesh();
 };
 
 }