X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.h;h=dadbf068c1b3ed9a6bf3772a71f51220df4b1876;hb=5e39ffb806f876099fcad5f2f5fe35993090de8a;hp=8348f60d3920d6ac276be5102571a000817cda16;hpb=bde934f7d5ba07a9442a305192e10024820d13ed;p=r2c2.git

diff --git a/source/designer/designer.h b/source/designer/designer.h
index 8348f60..dadbf06 100644
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -11,6 +11,7 @@
 #include <msp/gl/object.h>
 #include <msp/gl/pipeline.h>
 #include <msp/gltk/label.h>
+#include <msp/gltk/layout.h>
 #include <msp/gltk/resources.h>
 #include <msp/gltk/root.h>
 #include <msp/time/timestamp.h>
@@ -35,9 +36,7 @@ private:
 	{
 		SELECT,
 		CATALOGUE,
-		MANIPULATE,
-		MANIPULATE_DONE,
-		MEASURE
+		TOOL
 	};
 
 	Msp::Graphics::SimpleGLWindow window;
@@ -45,6 +44,7 @@ private:
 	Msp::Input::Mouse mouse;
 	Msp::GLtk::Resources ui_res;
 	Msp::GLtk::Root root;
+	Msp::GLtk::Layout *root_layout;
 
 	std::vector<Toolbar *> toolbars;
 	Msp::GLtk::Label *lbl_status;
@@ -61,13 +61,12 @@ private:
 	Msp::GL::Object *base_object;
 	R2C2::Route *cur_route;
 	R2C2::Zone *cur_zone;
-	std::list<R2C2::Track *> new_tracks;
+	std::list<R2C2::Path3D *> highlight_paths;
 
 	Mode mode;
 	Selection selection;
 	SelectionWrap sel_wrap;
-	Manipulator manipulator;
-	Measure measure;
+	Tool *cur_tool;
 	CameraController *camera_ctl;
 
 	Msp::Time::TimeStamp last_tick;
@@ -84,8 +83,6 @@ public:
 	R2C2::Layout &get_layout() { return *layout; }
 	R2C2::Layout3D &get_layout_3d() { return *layout_3d; }
 	const CameraController &get_camera_controller() const { return *camera_ctl; }
-	const Msp::GLtk::Resources &get_ui_resources() const { return ui_res; }
-	Msp::GLtk::Root &get_root() { return root; }
 
 	void new_track();
 	void erase_tracks();
@@ -109,12 +106,14 @@ public:
 private:
 	void tick();
 	void key_press(unsigned);
+	template<typename T>
+	T *use_tool_with_selected_objects();
+	template<typename T>
+	T *use_tool();
+	void use_tool(Tool *);
 	void button_press(unsigned);
-	void axis_motion(unsigned, float, float);
 	void apply_camera();
 	void render();
-	void track_added(R2C2::Track &);
-	void track_removed(R2C2::Track &);
 	R2C2::Object *pick_object(const R2C2::Vector &);
 	void update_track_icon(R2C2::Track3D &);
 	void selection_changed();
@@ -122,7 +121,6 @@ private:
 	void manipulation_done(bool);
 	void measure_changed();
 	void measure_done();
-	void arrange_toolbars();
 	void track_properties_response(int);
 	void route_name_accept(const std::string &);
 	void svg_export_accept(const std::string &);