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

diff --git a/source/designer/designer.h b/source/designer/designer.h
index 02649cb..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;
@@ -68,8 +66,7 @@ private:
 	Mode mode;
 	Selection selection;
 	SelectionWrap sel_wrap;
-	Manipulator manipulator;
-	Measure measure;
+	Tool *cur_tool;
 	CameraController *camera_ctl;
 
 	Msp::Time::TimeStamp last_tick;
@@ -109,8 +106,12 @@ 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();
 	R2C2::Object *pick_object(const R2C2::Vector &);