X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.h;h=61a2f59e37730c53e88a87bccbfd26bda1ea6abc;hb=e13742268b7030f8d6152858d39f1c6b43f94c88;hp=30a3825893827539c8328487e91b76e15c8037eb;hpb=d27edb207810f0b4e44be8c3632d421faa5fed80;p=r2c2.git diff --git a/source/engineer/engineer.h b/source/engineer/engineer.h index 30a3825..61a2f59 100644 --- a/source/engineer/engineer.h +++ b/source/engineer/engineer.h @@ -20,12 +20,13 @@ Distributed under the GPL #include "libmarklin/train.h" #include "3d/layout.h" #include "3d/overlay.h" +#include "3d/path.h" #include "network/server.h" #include "options.h" class MainPanel; class TrainPanel; -class TrainProperties; +class TrainView; class Engineer: public Msp::Application { @@ -55,11 +56,15 @@ private: MainPanel *main_panel; std::list train_panels; + std::list train_views; Msp::Time::TimeStamp status_timeout; bool picking; Marklin::Track *picking_track; int picking_entry; Marklin::Path3D *picking_path; + int pointer_x; + int pointer_y; + bool pointer_moved; public: Engineer(int argc, char **argv); @@ -69,7 +74,12 @@ public: Msp::GLtk::Root &get_root() const { return *root; } const Marklin::Catalogue &get_catalogue() const { return catalogue; } Marklin::Layout &get_layout() { return layout; } + Marklin::Layout3D &get_layout_3d() { return layout_3d; } + const Msp::GL::Lighting &get_lighting() const { return lighting; } void set_status(const std::string &); + void rearrange_panels(); + void add_train_view(TrainView &); + void remove_train_view(TrainView &); void pick(bool); int main(); void quit() { exit(0); }