X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.h;h=72fdd29c877fcd778f0a829c9fec6f51fd4a049e;hb=ca9d278f9472206ad9a01190dcef9f0eb1bcc274;hp=61a2f59e37730c53e88a87bccbfd26bda1ea6abc;hpb=fcaa883538f98bac71ba1a90f98950bb2aa08d88;p=r2c2.git

diff --git a/source/engineer/engineer.h b/source/engineer/engineer.h
index 61a2f59..72fdd29 100644
--- a/source/engineer/engineer.h
+++ b/source/engineer/engineer.h
@@ -1,23 +1,16 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #ifndef ENGINEER_H_
 #define ENGINEER_H_
 
 #include <msp/core/application.h>
-#include <msp/gbase/simplewindow.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/train.h"
+#include "libr2c2/catalogue.h"
+#include "libr2c2/train.h"
 #include "3d/layout.h"
 #include "3d/overlay.h"
 #include "3d/path.h"
@@ -28,25 +21,27 @@ class MainPanel;
 class TrainPanel;
 class TrainView;
 
-class Engineer: public Msp::Application
+class Engineer: public Msp::RegisteredApplication<Engineer>
 {
 public:
-	sigc::signal<void, Marklin::Track *, int> signal_pick_done;
+	sigc::signal<void, R2C2::Track *, int> signal_pick_done;
 
 private:
 	Options options;
 
 	Msp::Graphics::SimpleGLWindow window;
+	Msp::Input::Keyboard keyboard;
+	Msp::Input::Mouse mouse;
 	Msp::GLtk::Resources ui_res;
 	Msp::GLtk::Root *root;
 
-	Marklin::Catalogue catalogue;
-	Marklin::Layout layout;
-	Marklin::Layout3D layout_3d;
-	Marklin::Server *server;
+	R2C2::Catalogue catalogue;
+	R2C2::Layout layout;
+	R2C2::Layout3D layout_3d;
+	R2C2::Server *server;
 	Msp::IO::EventDispatcher event_disp;
-	Marklin::Overlay3D *overlay;
-	std::map<Marklin::Train *, Msp::GL::Color> train_colors;
+	R2C2::Overlay3D *overlay;
+	std::map<R2C2::Train *, Msp::GL::Color> train_colors;
 
 	Msp::GL::Camera camera;
 	Msp::GL::Lighting lighting;
@@ -55,15 +50,15 @@ private:
 	Msp::GL::Mesh arrow_mesh;
 
 	MainPanel *main_panel;
+	std::list<R2C2::Train *> new_trains;
 	std::list<TrainPanel *> train_panels;
 	std::list<TrainView *> train_views;
 	Msp::Time::TimeStamp status_timeout;
 	bool picking;
-	Marklin::Track *picking_track;
+	R2C2::Track *picking_track;
 	int picking_entry;
-	Marklin::Path3D *picking_path;
-	int pointer_x;
-	int pointer_y;
+	R2C2::Path3D *picking_path;
+	R2C2::Vector pointer;
 	bool pointer_moved;
 
 public:
@@ -72,9 +67,9 @@ 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; }
-	Marklin::Layout &get_layout() { return layout; }
-	Marklin::Layout3D &get_layout_3d() { return layout_3d; }
+	const R2C2::Catalogue &get_catalogue() const { return catalogue; }
+	R2C2::Layout &get_layout() { return layout; }
+	R2C2::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();
@@ -85,18 +80,17 @@ public:
 	void quit() { exit(0); }
 private:
 	void tick();
-	void button_press(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 set_block_color(const R2C2::Block &, const Msp::GL::Color &);
+	void reset_block_color(const R2C2::Block &);
 	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 &);
+	void block_reserved(const R2C2::Block &, const R2C2::Train *);
+	R2C2::Track *pick_track(const R2C2::Vector &);
+	void train_added(R2C2::Train &);
+	void process_new_train(R2C2::Train &);
 	virtual void sighandler(int);
-
-	static Msp::Application::RegApp<Engineer> reg;
 };
 
 #endif