Major architecture rework

[r2c2.git] / source / engineer / engineer.h

diff --git a/source/engineer/engineer.h b/source/engineer/engineer.h
index 3e7a9109b7523ea6cba7b6dfb5a0d546048ef34e..5fa05871973e302872b589589df060b3c29680d3 100644 (file)
--- a/source/engineer/engineer.h
+++ b/source/engineer/engineer.h
@@ -17,13 +17,11 @@ Distributed under the GPL
 #include <msp/gltk/resources.h>
 #include <msp/gltk/root.h>
 #include "libmarklin/catalogue.h"
-#include "libmarklin/control.h"
-#include "libmarklin/locotype.h"
-#include "libmarklin/trafficmanager.h"
 #include "libmarklin/train.h"
 #include "3d/layout.h"
 #include "3d/overlay.h"
 #include "network/server.h"
+#include "options.h"
 
 class MainPanel;
 class TrainPanel;
@@ -32,15 +30,15 @@ class TrainProperties;
 class Engineer: public Msp::Application
 {
 private:
-       Msp::Graphics::SimpleGLWindow *window;
+       Options options;
+
+       Msp::Graphics::SimpleGLWindow window;
        Msp::GLtk::Resources ui_res;
        Msp::GLtk::Root *root;
 
        Marklin::Catalogue catalogue;
        Marklin::Layout layout;
        Marklin::Layout3D layout_3d;
-       Marklin::Control control;
-       Marklin::TrafficManager *trfc_mgr;
        Marklin::Server *server;
        Msp::IO::EventDispatcher event_disp;
        Marklin::Overlay3D *overlay;
@@ -49,7 +47,7 @@ private:
        Msp::GL::Camera camera;
        Msp::GL::Lighting lighting;
        Msp::GL::Light light;
-       Msp::GL::Pipeline *pipeline;
+       Msp::GL::Pipeline pipeline;
        Msp::GL::Mesh arrow_mesh;
 
        MainPanel *main_panel;
@@ -58,8 +56,6 @@ private:
        Marklin::Block *placing_block;
        unsigned placing_entry;
 
-       bool simulate;
-
 public:
        Engineer(int argc, char **argv);
        ~Engineer();
@@ -67,9 +63,7 @@ public:
        const Msp::GLtk::Resources &get_ui_resources() const { return ui_res; }
        Msp::GLtk::Root &get_root() const { return *root; }
        const Marklin::Catalogue &get_catalogue() const { return catalogue; }
-       const Marklin::Layout &get_layout() const { return layout; }
-       Marklin::Control &get_control() { return control; }
-       Marklin::TrafficManager &get_traffic_manager() { return *trfc_mgr; }
+       Marklin::Layout &get_layout() { return layout; }
        void place_train(Marklin::Train &);
        int main();
        void quit() { exit(0); }
@@ -80,7 +74,7 @@ private:
        void view_all();
        void set_block_color(const Marklin::Block &, const Msp::GL::Color &);
        void reset_block_color(const Marklin::Block &);
-       void sensor_event(bool, Marklin::Sensor *);
+       void sensor_event(unsigned, bool);
        void block_reserved(const Marklin::Block &, const Marklin::Train *);
        Marklin::Track3D *pick_track(int, int);
        void train_added(Marklin::Train &);