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

diff --git a/source/designer/designer.h b/source/designer/designer.h
index b78ad81..a132b47 100644
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -34,11 +34,8 @@ class Designer: public Msp::RegisteredApplication<Designer>
 private:
 	enum Mode
 	{
-		SELECT,
 		CATALOGUE,
-		MANIPULATE,
-		MANIPULATE_DONE,
-		MEASURE
+		TOOL
 	};
 
 	Msp::Graphics::SimpleGLWindow window;
@@ -63,13 +60,13 @@ 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;
+	unsigned keep_status;
 	CameraController *camera_ctl;
 
 	Msp::Time::TimeStamp last_tick;
@@ -85,11 +82,12 @@ public:
 	const R2C2::Catalogue &get_catalogue() const { return catalogue; }
 	R2C2::Layout &get_layout() { return *layout; }
 	R2C2::Layout3D &get_layout_3d() { return *layout_3d; }
+	const R2C2::View3D &get_view() const { return *main_view; }
 	const CameraController &get_camera_controller() const { return *camera_ctl; }
 
-	void new_track();
-	void erase_tracks();
-	void track_properties();
+	void new_object();
+	void erase_objects();
+	void object_properties();
 	void extend_track();
 	void connect_tracks();
 	void flatten_tracks();
@@ -109,20 +107,19 @@ 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 use_select_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();
-	void manipulation_status(const std::string &);
-	void manipulation_done(bool);
-	void measure_changed();
-	void measure_done();
-	void track_properties_response(int);
+	void update_object_icon(R2C2::Object &);
+	void tool_status(const std::string &);
+	void object_properties_response(int);
 	void route_name_accept(const std::string &);
 	void svg_export_accept(const std::string &);
 	std::string tooltip(int, int);