X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.h;h=e103a749a4f41a2d4c0bd286f1975dee00c9b7bb;hb=f42183985c65e1e12f19e9246dee90b8e7e44a34;hp=6e4e78d0e71fa7d8b3a1f4e9f1b1ebc2f59ea0ce;hpb=3e9c210ddc036cd015228504cc0803c909e27f84;p=r2c2.git

diff --git a/source/designer/designer.h b/source/designer/designer.h
index 6e4e78d..e103a74 100644
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -10,7 +10,14 @@ Distributed under the GPL
 
 #include <string>
 #include <msp/core/application.h>
+#include <msp/gbase/display.h>
+#include <msp/gbase/window.h>
+#include <msp/gbase/glcontext.h>
 #include <msp/gl/font.h>
+#include <msp/gl/mesh.h>
+#include <msp/gltk/label.h>
+#include <msp/gltk/resources.h>
+#include <msp/gltk/root.h>
 #include <msp/time/timestamp.h>
 #include "libmarklin/catalogue.h"
 #include "libmarklin/layout.h"
@@ -21,6 +28,7 @@ class Input;
 class Manipulator;
 class Measure;
 class Selection;
+class Toolbar;
 
 class Designer: public Msp::Application
 {
@@ -34,66 +42,88 @@ private:
 		INPUT
 	};
 
-	unsigned       screen_w;
-	unsigned       screen_h;
-	Msp::GL::Font  *font;
+	Msp::Graphics::Display *dpy;
+	Msp::Graphics::Window *wnd;
+	Msp::Graphics::GLContext *glc;
+	unsigned screen_w;
+	unsigned screen_h;
+	Msp::GLtk::Resources ui_res;
+	Msp::GLtk::Root *root;
+
+	Toolbar *toolbar;
+	Msp::GLtk::Label *lbl_tooltip;
+	Msp::Time::TimeStamp tooltip_timeout;
+
 	Marklin::Catalogue catalogue;
-	Marklin::Layout    *layout;
-	Marklin::Layout3D  *layout_3d;
-	Marklin::Layout    *cat_layout;
-	Marklin::Layout3D  *cat_layout_3d;
-	Selection      *selection;
-	Manipulator    *manipulator;
-	Measure        *measure;
-	Input          *input;
-	Mode           mode;
-	float          cam_yaw;
-	float          cam_pitch;
+	Marklin::Layout *cat_layout;
+	Marklin::Layout3D *cat_layout_3d;
+	std::string filename;
+	Marklin::Layout *layout;
+	Marklin::Layout3D *layout_3d;
+	Msp::GL::Mesh *base_mesh;
+	Marklin::Route *cur_route;
+
+	Mode mode;
+	Selection *selection;
+	Manipulator *manipulator;
+	Measure *measure;
+	Input *input;
+
+	float cam_yaw;
+	float cam_pitch;
 	Marklin::Point cam_pos;
-	bool           shift;
-	int            move_x;
-	int            move_y;
-	int            zoom;
-	int            rotate;
-	int            pitch;
-	int            pointer_x;
-	int            pointer_y;
-	int            tooltip_x;
-	int            tooltip_y;
-	std::string    tooltip;
-	Msp::Time::TimeStamp tooltip_timeout;
+
+	bool shift;
+	int move_x;
+	int move_y;
+	int zoom;
+	int rotate;
+	int pitch;
+	int pointer_x;
+	int pointer_y;
+
 	Msp::Time::TimeStamp last_tick;
 
+	static Msp::Application::RegApp<Designer> reg;
+
 public:
 	Designer(int, char **);
 	~Designer();
 
+	int main();
+	void save();
+	void quit();
+
 	Marklin::Layout *get_layout() { return layout; }
 	Marklin::Layout3D *get_layout_3d() { return layout_3d; }
-	Msp::GL::Font   &get_font()   { return *font; }
-	int             main();
-	void            map_pointer_coords(int, int, float &, float &);
+	const Msp::GLtk::Resources &get_ui_resources() const { return ui_res; }
+	Msp::GLtk::Root &get_root() const { return *root; }
+	void edit_route(Marklin::Route &);
+	Marklin::Route *get_current_route() const { return cur_route; }
+	void add_selection_to_route();
+
+	void map_pointer_coords(int, int, float &, float &);
 private:
 	void tick();
 	void key_press(unsigned, unsigned, wchar_t);
 	void key_release(unsigned, unsigned);
-	void button_press(int, int, float, float, unsigned);
-	void pointer_motion(int, int, float, float);
+	void button_press(int, int, unsigned, unsigned);
+	void pointer_motion(int, int);
 	void project_3d();
 	void apply_camera();
 	void render();
 	Marklin::Track3D *pick_track(int, int);
+	void update_track_color(Marklin::Track3D &);
 	void manipulation_status(const std::string &);
 	void manipulation_done(bool);
 	void measure_changed();
 	void measure_done();
-	void move_tooltip(int, int);
+	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();
-
-	static Msp::Application::RegApp<Designer> reg;
 };
 
 #endif