X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fmanipulator.h;h=469f09f769fe5a768ad40c3501d0ff6f454a91d2;hb=ec1f75d72e5c4f7f7c9dafdf80f58c30ffb1a855;hp=965c21f51199d3b4461ae9609e7c17c9c0fef7e8;hpb=29433673a88dffd61ecb8e6c8fe6ab38e2012586;p=r2c2.git

diff --git a/source/designer/manipulator.h b/source/designer/manipulator.h
index 965c21f..469f09f 100644
--- a/source/designer/manipulator.h
+++ b/source/designer/manipulator.h
@@ -41,23 +41,22 @@ public:
 
 private:
 	Designer &designer;
-	Msp::Graphics::EventSource &event_source;
+	Msp::Input::Mouse &mouse;
 	Selection &selection;
 	std::vector<MTrack> tracks;
 	R2C2::Vector center;
 
+	R2C2::Vector pointer;
 	R2C2::Vector gpointer;
-	int pointer_y;
 	Mode mode;
 	R2C2::Vector move_origin;
 	float angle;
 	float rot_origin;
-	int elev_origin;
 	std::set<R2C2::Track *> neighbors;
 	std::vector<R2C2::Track *> extend_tracks;
 
 public:
-	Manipulator(Designer &, Msp::Graphics::EventSource &, Selection &);
+	Manipulator(Designer &, Msp::Input::Mouse &, Selection &);
 
 	void start_move();
 	void start_rotate();
@@ -69,8 +68,8 @@ public:
 	void connect();
 	void cancel();
 private:
-	void button_press(int, int, unsigned, unsigned);
-	void pointer_motion(int, int);
+	void button_press(unsigned);
+	void axis_motion(unsigned, float, float);
 	void selection_changed();
 	void update_tracks();
 	void update_neighbors();