X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fengineer%2Fengineer.h;h=61a2f59e37730c53e88a87bccbfd26bda1ea6abc;hb=6e5d36dbc3f1e4a221d424fa7d57b07998df67a8;hp=3e7a9109b7523ea6cba7b6dfb5a0d546048ef34e;hpb=bc8ac89bbe774bb133b758416182aa18e5e0a5a5;p=r2c2.git

diff --git a/source/engineer/engineer.h b/source/engineer/engineer.h
index 3e7a910..61a2f59 100644
--- a/source/engineer/engineer.h
+++ b/source/engineer/engineer.h
@@ -17,48 +17,54 @@ 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 "3d/path.h"
 #include "network/server.h"
+#include "options.h"
 
 class MainPanel;
 class TrainPanel;
-class TrainProperties;
+class TrainView;
 
 class Engineer: public Msp::Application
 {
+public:
+	sigc::signal<void, Marklin::Track *, int> signal_pick_done;
+
 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;
-	std::list<Marklin::Train *> new_trains;
+	std::map<Marklin::Train *, Msp::GL::Color> train_colors;
 
 	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;
 	std::list<TrainPanel *> train_panels;
-	Marklin::Train *placing_train;
-	Marklin::Block *placing_block;
-	unsigned placing_entry;
-
-	bool simulate;
+	std::list<TrainView *> train_views;
+	Msp::Time::TimeStamp status_timeout;
+	bool picking;
+	Marklin::Track *picking_track;
+	int picking_entry;
+	Marklin::Path3D *picking_path;
+	int pointer_x;
+	int pointer_y;
+	bool pointer_moved;
 
 public:
 	Engineer(int argc, char **argv);
@@ -67,10 +73,14 @@ 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 &);
+	Marklin::Layout &get_layout() { return layout; }
+	Marklin::Layout3D &get_layout_3d() { return layout_3d; }
+	const Msp::GL::Lighting &get_lighting() const { return lighting; }
+	void set_status(const std::string &);
+	void rearrange_panels();
+	void add_train_view(TrainView &);
+	void remove_train_view(TrainView &);
+	void pick(bool);
 	int main();
 	void quit() { exit(0); }
 private:
@@ -80,7 +90,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 &);