X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Flayout.h;h=a7fbdb98b9dbc7b7751ce2e26470403dd647c85d;hb=a861c2729a356173059177a0b800de2b31c9b49c;hp=21686de5f9c8bbc4a19e1fdc21acffd2276b4267;hpb=7e382cc3cad8c4f6945b0c9d89e2ca917b42b740;p=r2c2.git diff --git a/source/3d/layout.h b/source/3d/layout.h index 21686de..a7fbdb9 100644 --- a/source/3d/layout.h +++ b/source/3d/layout.h @@ -8,6 +8,7 @@ Distributed under the GPL #ifndef MARKLIN3D_LAYOUT_H_ #define MARKLIN3D_LAYOUT_H_ +#include #include "libmarklin/layout.h" #include "catalogue.h" #include "track.h" @@ -20,6 +21,8 @@ private: Layout &layout; Catalogue3D catalogue; std::list tracks; + Msp::GL::Scene scene; + Msp::GL::Scene ep_scene; unsigned quality; public: @@ -28,10 +31,16 @@ public: const Catalogue3D &get_catalogue() const { return catalogue; } void set_quality(unsigned); + + void add_track(Track3D &); + void remove_track(Track3D &); const std::list &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 &);