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

diff --git a/source/designer/designer.h b/source/designer/designer.h
index b78ad81..dadbf06 100644
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -36,9 +36,7 @@ private:
 	{
 		SELECT,
 		CATALOGUE,
-		MANIPULATE,
-		MANIPULATE_DONE,
-		MEASURE
+		TOOL
 	};
 
 	Msp::Graphics::SimpleGLWindow window;
@@ -63,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;
@@ -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 object_added(R2C2::Object &);
-	void object_removed(R2C2::Object &);
 	R2C2::Object *pick_object(const R2C2::Vector &);
 	void update_track_icon(R2C2::Track3D &);
 	void selection_changed();