Include block in the emergency signal

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

diff --git a/source/engineer/engineer.h b/source/engineer/engineer.h
index 8e8e0216b21ef3a866c0d25b73a42e97e20e228e..7cf1cfcf475377bafc3a886e6cddee368997681f 100644 (file)
--- a/source/engineer/engineer.h
+++ b/source/engineer/engineer.h
@@ -1,61 +1,55 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #ifndef ENGINEER_H_
 #define ENGINEER_H_
 
 #include <msp/core/application.h>
-#include <msp/gbase/glcontext.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 <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 "libr2c2/catalogue.h"
+#include "libr2c2/driver.h"
+#include "libr2c2/train.h"
 #include "3d/layout.h"
+#include "3d/overlay.h"
+#include "3d/path.h"
+#include "3d/view.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>
 {
 private:
-       Msp::Graphics::Display *dpy;
-       Msp::Graphics::Window *wnd;
-       Msp::Graphics::GLContext *glc;
-       unsigned screen_w;
-       unsigned screen_h;
-       bool fullscreen;
+       Options options;
+
+       Msp::Graphics::SimpleGLWindow window;
+       Msp::Input::Keyboard keyboard;
+       Msp::Input::Mouse mouse;
        Msp::GLtk::Resources ui_res;
        Msp::GLtk::Root *root;
+       Msp::GLtk::Arrangement *root_arrangement;
+       bool import_active;
 
-       Marklin::Catalogue catalogue;
-       Marklin::Layout layout;
-       Marklin::Layout3D layout_3d;
-       Marklin::Control control;
-       Marklin::TrafficManager *trfc_mgr;
-       Marklin::Server *server;
+       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;
 
-       Marklin::Point cam_pos;
-       float cam_rot;
+       R2C2::View3D main_view;
 
-       MainPanel *main_panel;
-       std::list<TrainPanel *> train_panels;
-       Marklin::Train *placing_train;
-       Marklin::Block *placing_block;
-       unsigned placing_entry;
-
-       bool no_lighting;
-       bool simulate;
+       MainWindow *main_wnd;
+       std::list<R2C2::Train *> new_trains;
+       std::list<TrainView *> train_views;
+       Msp::Time::TimeStamp status_timeout;
+       R2C2::Vector pointer;
 
 public:
        Engineer(int argc, char **argv);
@@ -63,28 +57,27 @@ 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; }
-       void place_train(Marklin::Train &);
+       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; }
+       void set_status(const std::string &);
+       void add_train_view(TrainView &);
+       void remove_train_view(TrainView &);
        int main();
        void quit() { exit(0); }
 private:
        void tick();
-       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 train_added(Marklin::Train &);
-
-       static Msp::Application::RegApp<Engineer> reg;
+       R2C2::Object *pick_object(const R2C2::Vector &);
+       void emergency(R2C2::Block *, const std::string &);
+       void locomotive_detected(const R2C2::Driver::DetectedLocomotive &);
+       void import_finished(int);
+       void train_added(R2C2::Train &);
+       void process_new_train(R2C2::Train &);
+       virtual void sighandler(int);
 };
 
 #endif