Move user interface code to its own class

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

diff --git a/source/engineer/engineer.h b/source/engineer/engineer.h
index f6e23bc28e18c1fc27d6b48f1e44c528563176ce..712dc1638bfa9f72c7965b80556655b0565350a1 100644 (file)
--- a/source/engineer/engineer.h
+++ b/source/engineer/engineer.h
@@ -2,76 +2,72 @@
 #define ENGINEER_H_
 
 #include <msp/core/application.h>
-#include <msp/gbase/glcontext.h>
-#include <msp/gl/font.h>
-#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 <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/input/keyboard.h>
+#include <msp/input/mouse.h>
+#include "libr2c2/catalogue.h"
+#include "libr2c2/train.h"
 #include "3d/layout.h"
+#include "3d/overlay.h"
+#include "3d/path.h"
+#include "3d/trackchain.h"
+#include "3d/view.h"
+#include "network/server.h"
+#include "options.h"
+#include "userinterface.h"
 
-class MainPanel;
-class TrainPanel;
-class TrainProperties;
-
-class Engineer: public Msp::Application
+class Engineer: public Msp::RegisteredApplication<Engineer>
 {
 private:
-       Msp::Graphics::Display   *dpy;
-       Msp::Graphics::Window    *wnd;
-       Msp::Graphics::GLContext *glc;
-       Msp::GLtk::Root          *root;
-       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::GLtk::Resources ui_res;
-       MainPanel          *main_panel;
-       std::list<TrainPanel *> train_panels;
-       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;
+       Options options;
+
+       Msp::Graphics::SimpleGLWindow window;
+       Msp::Input::Keyboard keyboard;
+       Msp::Input::Mouse mouse;
+
+       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;
+
+       R2C2::View3D main_view;
+       UserInterface ui;
+
+       std::list<R2C2::Train *> new_trains;
+       R2C2::Vector pointer;
+       std::list<R2C2::TrackChain3D *> emergencies;
+       Msp::Time::TimeStamp emergency_blink_timeout;
+       unsigned emergency_blink_state;
 
 public:
        Engineer(int argc, char **argv);
        ~Engineer();
 
-       const Marklin::Catalogue &get_catalogue() const { return catalogue; }
-       Marklin::Control &get_control()    { return control; }
-       void             add_train();
-       Marklin::Train   *add_train(const Marklin::LocoType &, unsigned);
-       void     place_train(Marklin::Train &);
-       int      main();
-       void     quit() { exit(0); }
+       const R2C2::Catalogue &get_catalogue() const { return catalogue; }
+       R2C2::Layout &get_layout() { return layout; }
+       R2C2::Layout3D &get_layout_3d() { return layout_3d; }
+       R2C2::View3D &get_main_view() { return main_view; }
+       UserInterface &get_user_interface() { return ui; }
+       int main();
+       void quit() { exit(0); }
 private:
        void tick();
-       void key_press(unsigned, unsigned, wchar_t);
-       void button_press(int, int, unsigned, unsigned);
-       void button_release(int, int, unsigned, 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 Msp::GL::Color &);
-       void reset_block_color(const Marklin::Block &);
-       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;
+       R2C2::Object *pick_object(const R2C2::Vector &);
+       void emergency(R2C2::Block *, const std::string &);
+       void halt_event(bool);
+       void train_added(R2C2::Train &);
+       void process_new_train(R2C2::Train &);
+       virtual void sighandler(int);
 };
 
 #endif