Use Msp::IO::print instead of std::cout

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

diff --git a/source/engineer/engineer.h b/source/engineer/engineer.h
index f6e23bc28e18c1fc27d6b48f1e44c528563176ce..8e8e0216b21ef3a866c0d25b73a42e97e20e228e 100644 (file)
--- a/source/engineer/engineer.h
+++ b/source/engineer/engineer.h
@@ -1,3 +1,10 @@
+/* $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_
 
@@ -12,6 +19,7 @@
 #include "libmarklin/trafficmanager.h"
 #include "libmarklin/train.h"
 #include "3d/layout.h"
+#include "network/server.h"
 
 class MainPanel;
 class TrainPanel;
@@ -20,45 +28,50 @@ class TrainProperties;
 class Engineer: public Msp::Application
 {
 private:
-       Msp::Graphics::Display   *dpy;
-       Msp::Graphics::Window    *wnd;
+       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;
+       unsigned screen_w;
+       unsigned screen_h;
+       bool fullscreen;
        Msp::GLtk::Resources ui_res;
-       MainPanel          *main_panel;
-       std::list<TrainPanel *> train_panels;
-       bool               no_lighting;
+       Msp::GLtk::Root *root;
+
+       Marklin::Catalogue catalogue;
+       Marklin::Layout layout;
+       Marklin::Layout3D layout_3d;
+       Marklin::Control control;
        Marklin::TrafficManager *trfc_mgr;
-       Marklin::Train     *placing_train;
-       Marklin::Block     *placing_block;
-       unsigned           placing_entry;
-       bool               simulate;
-       TrainProperties    *train_prop;
-       bool               train_prop_stale;
+       Marklin::Server *server;
+       Msp::IO::EventDispatcher event_disp;
+
+       Marklin::Point cam_pos;
+       float cam_rot;
+
+       MainPanel *main_panel;
+       std::list<TrainPanel *> train_panels;
+       Marklin::Train *placing_train;
+       Marklin::Block *placing_block;
+       unsigned placing_entry;
+
+       bool no_lighting;
+       bool simulate;
 
 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 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 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 &);
+       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);
@@ -69,7 +82,7 @@ private:
        void block_reserved(const Marklin::Block &, const Marklin::Train *);
        void project_3d();
        Marklin::Track3D *pick_track(int, int);
-       void dismiss_train_prop();
+       void train_added(Marklin::Train &);
 
        static Msp::Application::RegApp<Engineer> reg;
 };