X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.h;h=8ce848e8779f971f408c077729b032e1f298d6ef;hb=e5cd9e4fbc577036a0385c985b6b65df8218d0a2;hp=c7c062fe2347331d41289a74f1378d862e84dee2;hpb=010d8321e982d1684fcbff5bf6fc2bdec7cb7bae;p=r2c2.git

diff --git a/source/engineer/engineer.h b/source/engineer/engineer.h
index c7c062f..8ce848e 100644
--- a/source/engineer/engineer.h
+++ b/source/engineer/engineer.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -9,17 +9,20 @@ Distributed under the GPL
 #define ENGINEER_H_
 
 #include <msp/core/application.h>
-#include <msp/gbase/glcontext.h>
-#include <msp/gl/font.h>
+#include <msp/gbase/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 "3d/layout.h"
+#include "3d/overlay.h"
+#include "3d/path.h"
 #include "network/server.h"
+#include "options.h"
 
 class MainPanel;
 class TrainPanel;
@@ -27,63 +30,62 @@ class TrainProperties;
 
 class Engineer: public Msp::Application
 {
+public:
+	sigc::signal<void, Marklin::Track *, int> signal_pick_done;
+
 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::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::map<Marklin::Train *, Msp::GL::Color> train_colors;
 
-	Marklin::Point cam_pos;
-	float cam_rot;
+	Msp::GL::Camera camera;
+	Msp::GL::Lighting lighting;
+	Msp::GL::Light light;
+	Msp::GL::Pipeline pipeline;
+	Msp::GL::Mesh arrow_mesh;
 
 	MainPanel *main_panel;
 	std::list<TrainPanel *> train_panels;
-	TrainProperties *train_prop;
-	bool train_prop_stale;
-	Marklin::Train *placing_train;
-	Marklin::Block *placing_block;
-	unsigned placing_entry;
-
-	bool no_lighting;
-	bool simulate;
+	Msp::Time::TimeStamp status_timeout;
+	bool picking;
+	Marklin::Track *picking_track;
+	int picking_entry;
+	Marklin::Path3D *picking_path;
 
 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 &);
+	Marklin::Layout &get_layout() { return layout; }
+	void set_status(const std::string &);
+	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, unsigned);
-	void button_release(int, int, unsigned, unsigned);
 	void pointer_motion(int, int);
 	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 *);
-	void project_3d();
 	Marklin::Track3D *pick_track(int, int);
-	void dismiss_train_prop();
+	void train_added(Marklin::Train &);
+	virtual void sighandler(int);
 
 	static Msp::Application::RegApp<Engineer> reg;
 };