X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Flayout.h;h=2e56ea63bd0195ea8ede83b3219f6f8dde1392f3;hb=bc8ac89bbe774bb133b758416182aa18e5e0a5a5;hp=9120af6356b2320018e05b7dadfaf3d1da5fedcd;hpb=48dff17ed3144d944965e7cb534e1f8fb92bd620;p=r2c2.git diff --git a/source/3d/layout.h b/source/3d/layout.h index 9120af6..2e56ea6 100644 --- a/source/3d/layout.h +++ b/source/3d/layout.h @@ -12,6 +12,7 @@ Distributed under the GPL #include "libmarklin/layout.h" #include "catalogue.h" #include "track.h" +#include "train.h" namespace Marklin { @@ -21,6 +22,7 @@ private: Layout &layout; Catalogue3D catalogue; std::list tracks; + std::list trains; Msp::GL::Scene scene; Msp::GL::Scene ep_scene; @@ -36,12 +38,18 @@ public: Track3D &get_track(const Track &) const; Track3D *pick_track(float, float, float) const; + void set_traffic_manager(TrafficManager &); + void add_train(Train3D &); + void remove_train(Train3D &); + Train3D &get_train(const Train &) 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 &); + void train_added(Train &); }; } // namespace Marklin