X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fmanipulator.h;h=8115ab4abd8dd7e8e3b1d6429a249737b2efbf09;hb=293bfd4d1a5dbd57c7d3c657e5f6467d9f2e3300;hp=b482251294ee21f9242c68f7dbb1b708cffc25b7;hpb=3e9c210ddc036cd015228504cc0803c909e27f84;p=r2c2.git

diff --git a/source/designer/manipulator.h b/source/designer/manipulator.h
index b482251..8115ab4 100644
--- a/source/designer/manipulator.h
+++ b/source/designer/manipulator.h
@@ -9,7 +9,6 @@ Distributed under the GPL
 #define MANIPULATOR_H_
 
 #include <sigc++/sigc++.h>
-#include "3d/track.h"
 
 class Designer;
 class Selection;
@@ -42,53 +41,41 @@ private:
 		TrackOrder(Marklin::Track *t, bool r): track(t), rev(r) { }
 	};
 
-	struct TrackWrap
-	{
-		Marklin::Point pos;
-		float rot;
-		float width;
-		float height;
-	};
+public:
+	sigc::signal<void, const std::string &> signal_status;
+	sigc::signal<void, bool> signal_done;
 
-	Designer   &designer;
-	Selection  *selection;
+private:
+	Designer &designer;
+	Selection &selection;
 	std::vector<MTrack> tracks;
 	Marklin::Point center;
 
-	std::list<TrackWrap> wrap;
-	Marklin::Point wrap_pos;
-	float wrap_rot;
-
 	Marklin::Point gpointer;
-	int            pointer_y;
-	Mode           mode;
+	int pointer_y;
+	Mode mode;
 	Marklin::Point move_origin;
-	float          angle;
-	float          rot_origin;
-	int            elev_origin;
+	float angle;
+	float rot_origin;
+	int elev_origin;
 	std::set<Marklin::Track *> neighbors;
-	sigc::connection selection_changed_conn;
 
 public:
-	sigc::signal<void, const std::string &> signal_status;
-	sigc::signal<void, bool> signal_done;
-
-	Manipulator(Designer &);
+	Manipulator(Designer &, Selection &);
 
-	void set_selection(Selection *);
 	void start_move();
 	void start_rotate();
 	void start_elevate();
 	void duplicate();
 	void flatten();
 	void even_slope(bool =false);
+	void connect();
 	void cancel();
 	void button_press(int, int, float, float, unsigned);
 	void pointer_motion(int, int, float, float);
-	void render();
 private:
 	void selection_changed();
-	void update_wrap();
+	void update_tracks();
 	void update_neighbors();
 	void set_slope(TrackOrder &, float, float);
 };