X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.h;h=d2cc5d212def4b2c520969b0e32ae0d0aef4c8ed;hb=17c219cff8f859978ec1274786319478cc99450c;hp=a72316e128044aea2e182190a59008f60712950c;hpb=e07c0d862a4d43b2585c93e79d25380d00675309;p=r2c2.git

diff --git a/source/designer/designer.h b/source/designer/designer.h
index a72316e..d2cc5d2 100644
--- a/source/designer/designer.h
+++ b/source/designer/designer.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
 */
 
@@ -24,13 +24,13 @@ Distributed under the GPL
 #include "libmarklin/catalogue.h"
 #include "libmarklin/layout.h"
 #include "3d/layout.h"
+#include "3d/overlay.h"
 #include "3d/track.h"
 #include "cameracontroller.h"
 #include "manipulator.h"
 #include "measure.h"
 #include "selection.h"
 
-class Input;
 class Toolbar;
 
 class Designer: public Msp::Application
@@ -41,8 +41,7 @@ private:
 		SELECT,
 		CATALOGUE,
 		MANIPULATE,
-		MEASURE,
-		INPUT
+		MEASURE
 	};
 
 	Msp::Graphics::SimpleGLWindow window;
@@ -50,14 +49,14 @@ private:
 	Msp::GLtk::Root *root;
 
 	Toolbar *toolbar;
-	Msp::GLtk::Label *lbl_tooltip;
-	Msp::Time::TimeStamp tooltip_timeout;
+	Msp::GLtk::Label *lbl_status;
 
 	Marklin::Catalogue catalogue;
 	Marklin::Layout3D *cat_layout_3d;
 	std::string filename;
 	Marklin::Layout *layout;
 	Marklin::Layout3D *layout_3d;
+	Marklin::Overlay3D *overlay;
 	Msp::GL::Object *base_object;
 	Marklin::Route *cur_route;
 	Msp::GL::Pipeline *pipeline;
@@ -69,13 +68,8 @@ private:
 	Selection selection;
 	Manipulator manipulator;
 	Measure measure;
-	Input *input;
 	CameraController camera_ctl;
 
-	bool shift;
-	int pointer_x;
-	int pointer_y;
-
 	Msp::Time::TimeStamp last_tick;
 
 	static Msp::Application::RegApp<Designer> reg;
@@ -90,8 +84,14 @@ public:
 
 	Marklin::Layout *get_layout() { return layout; }
 	Marklin::Layout3D *get_layout_3d() { return layout_3d; }
+	const Msp::GL::Camera &get_camera() const { return camera; }
 	const Msp::GLtk::Resources &get_ui_resources() const { return ui_res; }
 	Msp::GLtk::Root &get_root() const { return *root; }
+
+	void new_track();
+	void set_turnout_id();
+	void set_sensor_id();
+
 	void edit_route(Marklin::Route &);
 	Marklin::Route *get_current_route() const { return cur_route; }
 	void add_selection_to_route();
@@ -100,24 +100,20 @@ public:
 private:
 	void tick();
 	void key_press(unsigned, unsigned, wchar_t);
-	void key_release(unsigned, unsigned);
 	void button_press(int, int, unsigned, unsigned);
 	void pointer_motion(int, int);
 	void apply_camera();
 	void render();
 	Marklin::Track3D *pick_track(int, int);
-	void update_track_color(Marklin::Track3D &);
+	void update_track_icon(Marklin::Track3D &);
 	void manipulation_status(const std::string &);
 	void manipulation_done(bool);
 	void measure_changed();
 	void measure_done();
-	void set_tooltip(int, int, const std::string &);
-	void clear_tooltip();
-	void save_accept();
-	void turnout_id_accept();
-	void sensor_id_accept();
-	void input_dismiss();
+	void turnout_id_accept(const std::string &);
+	void sensor_id_accept(const std::string &);
 	void view_all();
+	std::string tooltip(int, int);
 };
 
 #endif