Use GL::Renderables and a Pipeline for rendering

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

diff --git a/source/3d/layout.h b/source/3d/layout.h
index 208ddacacba28254f267b6d121e44190f0f15d46..a7fbdb98b9dbc7b7751ce2e26470403dd647c85d 100644 (file)
--- a/source/3d/layout.h
+++ b/source/3d/layout.h
@@ -1,14 +1,16 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
 #ifndef MARKLIN3D_LAYOUT_H_
 #define MARKLIN3D_LAYOUT_H_
 
+#include <msp/gl/scene.h>
 #include "libmarklin/layout.h"
+#include "catalogue.h"
 #include "track.h"
 
 namespace Marklin {
@@ -17,18 +19,28 @@ class Layout3D
 {
 private:
        Layout &layout;
+       Catalogue3D catalogue;
        std::list<Track3D *> tracks;
+       Msp::GL::Scene scene;
+       Msp::GL::Scene ep_scene;
        unsigned quality;
 
 public:
        Layout3D(Layout &);
        ~Layout3D();
 
+       const Catalogue3D &get_catalogue() const { return catalogue; }
        void set_quality(unsigned);
+
+       void add_track(Track3D &);
+       void remove_track(Track3D &);
        const std::list<Track3D *> &get_tracks() const { return tracks; }
-       void render(bool =false) const;
        Track3D &get_track(const Track &) const;
        Track3D *pick_track(float, float, float) const;
+
+       Msp::GL::Scene &get_scene() { return scene; }
+       Msp::GL::Scene &get_endpoint_scene() { return ep_scene; }
+
 private:
        void track_added(Track &);
        void track_removed(Track &);