Complete rewrite of the engineer UI

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

diff --git a/source/engineer/engineer.h b/source/engineer/engineer.h
index dc48e70dadac3fe6729fc665318fa8da433a6a91..7997242e17cf0c82409e08d80b376d2e86c68566 100644 (file)
--- a/source/engineer/engineer.h
+++ b/source/engineer/engineer.h
@@ -2,67 +2,92 @@
 #define ENGINEER_H_
 
 #include <msp/core/application.h>
-#include <msp/gl/font.h>
+#include <msp/graphics/simplewindow.h>
+#include <msp/gl/camera.h>
+#include <msp/gl/light.h>
+#include <msp/gl/lighting.h>
+#include <msp/gl/pipeline.h>
 #include <msp/gltk/resources.h>
-#include "libmarklin/catalogue.h"
-#include "libmarklin/control.h"
-#include "libmarklin/trafficmanager.h"
-#include "libmarklin/train.h"
+#include <msp/gltk/root.h>
+#include "libr2c2/catalogue.h"
+#include "libr2c2/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 MainWindow;
+class TrainView;
 
-class Engineer: public Msp::Application
+class Engineer: public Msp::RegisteredApplication<Engineer>
 {
 public:
-       Engineer(int argc, char **argv);
-       ~Engineer();
+       sigc::signal<void, R2C2::Track *, int> signal_pick_done;
 
-       Marklin::Control &get_control()    { return control; }
-       Marklin::Train   *add_train(unsigned);
-       int      main();
-       void     quit() { exit(0); }
 private:
-       typedef std::list<TrainPanel *> TrainPanelSeq;
+       Options options;
 
-       unsigned           screen_w;
-       unsigned           screen_h;
-       bool               fullscreen;
-       Marklin::Catalogue catalogue;
-       Marklin::Layout    layout;
-       Marklin::Layout3D  layout_3d;
-       Marklin::Control   control;
-       Marklin::Point     cam_pos;
-       float              cam_rot;
+       Msp::Graphics::SimpleGLWindow window;
+       Msp::Input::Keyboard keyboard;
+       Msp::Input::Mouse mouse;
        Msp::GLtk::Resources ui_res;
-       MainPanel          *main_panel;
-       TrainPanelSeq      train_panels;
-       std::string        status_text;
-       bool               no_lighting;
-       Marklin::TrafficManager *trfc_mgr;
-       Marklin::Train     *placing_train;
-       Marklin::Block     *placing_block;
-       unsigned           placing_entry;
-       bool               simulate;
-       TrainProperties    *train_prop;
-       bool               train_prop_stale;
+       Msp::GLtk::Root *root;
+
+       R2C2::Catalogue catalogue;
+       R2C2::Layout layout;
+       R2C2::Layout3D layout_3d;
+       R2C2::Server *server;
+       Msp::IO::EventDispatcher event_disp;
+       R2C2::Overlay3D *overlay;
+       std::map<R2C2::Train *, Msp::GL::Color> train_colors;
 
+       Msp::GL::Camera camera;
+       Msp::GL::Lighting lighting;
+       Msp::GL::Light light;
+       Msp::GL::Pipeline pipeline;
+       Msp::GL::Mesh arrow_mesh;
+
+       MainWindow *main_wnd;
+       std::list<R2C2::Train *> new_trains;
+       std::list<TrainView *> train_views;
+       Msp::Time::TimeStamp status_timeout;
+       bool picking;
+       R2C2::Track *picking_track;
+       int picking_entry;
+       R2C2::Path3D *picking_path;
+       R2C2::Vector pointer;
+       bool pointer_moved;
+
+public:
+       Engineer(int argc, char **argv);
+       ~Engineer();
+
+       const Msp::GLtk::Resources &get_ui_resources() const { return ui_res; }
+       Msp::GLtk::Root &get_root() const { return *root; }
+       const R2C2::Catalogue &get_catalogue() const { return catalogue; }
+       R2C2::Layout &get_layout() { return layout; }
+       R2C2::Layout3D &get_layout_3d() { return layout_3d; }
+       const Msp::GL::Lighting &get_lighting() const { return lighting; }
+       void set_status(const std::string &);
+       void add_train_view(TrainView &);
+       void remove_train_view(TrainView &);
+       void pick(bool);
+       int main();
+       void quit() { exit(0); }
+private:
        void tick();
-       void key_press(unsigned, unsigned, wchar_t);
-       void button_press(int, int, unsigned);
-       void button_release(int, int, unsigned);
-       void pointer_motion(int, int);
+       void button_press(unsigned);
+       void axis_motion(unsigned, float, float);
        void view_all();
-       void set_block_color(const Marklin::Block &, const Marklin::Color &);
-       void sensor_event(bool, Marklin::Sensor *);
-       void block_reserved(const Marklin::Block &, const Marklin::Train *);
-       void project_3d();
-       Marklin::Track3D *pick_track(int, int);
-       void dismiss_train_prop();
-
-       static Msp::Application::RegApp<Engineer> reg;
+       void set_block_color(const R2C2::Block &, const Msp::GL::Color &);
+       void reset_block_color(const R2C2::Block &);
+       void sensor_event(unsigned, bool);
+       void block_reserved(const R2C2::Block &, const R2C2::Train *);
+       R2C2::Object *pick_object(const R2C2::Vector &);
+       void train_added(R2C2::Train &);
+       void process_new_train(R2C2::Train &);
+       virtual void sighandler(int);
 };
 
 #endif