X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fmanipulator.h;h=12e551bb7a1da125a7c3365f4806271b5d561d2c;hb=679c37910ab4d8030b3c09f6591381789b14a5f0;hp=965c21f51199d3b4461ae9609e7c17c9c0fef7e8;hpb=d15ac13f2e170f155b4bbd124df48400c339b644;p=r2c2.git

diff --git a/source/designer/manipulator.h b/source/designer/manipulator.h
index 965c21f..12e551b 100644
--- a/source/designer/manipulator.h
+++ b/source/designer/manipulator.h
@@ -18,13 +18,13 @@ private:
 		EXTEND
 	};
 
-	struct MTrack
+	struct MObject
 	{
-		R2C2::Track *track;
+		R2C2::Object *object;
 		R2C2::Vector pos;
 		float rot;
 
-		MTrack(R2C2::Track *);
+		MObject(R2C2::Object *);
 	};
 
 	struct TrackOrder
@@ -41,23 +41,23 @@ public:
 
 private:
 	Designer &designer;
-	Msp::Graphics::EventSource &event_source;
+	Msp::Input::Mouse &mouse;
 	Selection &selection;
-	std::vector<MTrack> tracks;
+	std::vector<MObject> objects;
 	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;
+	float elev_origin;
+	std::set<R2C2::Object *> 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,10 +69,10 @@ 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_objects();
 	void update_neighbors();
 	void set_slope(TrackOrder &, float, float);
 	std::vector<R2C2::Track *> create_straight(const R2C2::Vector &, float, float, float);