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

diff --git a/source/designer/manipulator.h b/source/designer/manipulator.h
index b482251..d8c3986 100644
--- a/source/designer/manipulator.h
+++ b/source/designer/manipulator.h
@@ -1,6 +1,6 @@
 /* $Id$
 
-This file is part of the MSP Märklin suite
+This file is part of R²C²
 Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
@@ -9,7 +9,6 @@ Distributed under the GPL
 #define MANIPULATOR_H_
 
 #include <sigc++/sigc++.h>
-#include "3d/track.h"
 
 class Designer;
 class Selection;
@@ -22,75 +21,68 @@ private:
 		NONE,
 		MOVE,
 		ROTATE,
-		ELEVATE
+		ELEVATE,
+		EXTEND
 	};
 
 	struct MTrack
 	{
-		Marklin::Track *track;
-		Marklin::Point pos;
+		R2C2::Track *track;
+		R2C2::Vector pos;
 		float rot;
 
-		MTrack(Marklin::Track *);
+		MTrack(R2C2::Track *);
 	};
 
 	struct TrackOrder
 	{
-		Marklin::Track *track;
+		R2C2::Track *track;
 		bool rev;
 
-		TrackOrder(Marklin::Track *t, bool r): track(t), rev(r) { }
+		TrackOrder(R2C2::Track *t, bool r): track(t), rev(r) { }
 	};
 
-	struct TrackWrap
-	{
-		Marklin::Point pos;
-		float rot;
-		float width;
-		float height;
-	};
-
-	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;
-	Marklin::Point move_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 &);
+private:
+	Designer &designer;
+	Msp::Graphics::EventSource &event_source;
+	Selection &selection;
+	std::vector<MTrack> tracks;
+	R2C2::Vector center;
+
+	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 &);
 
-	void set_selection(Selection *);
 	void start_move();
 	void start_rotate();
 	void start_elevate();
+	bool start_extend();
 	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 button_press(int, int, unsigned, unsigned);
+	void pointer_motion(int, int);
 	void selection_changed();
-	void update_wrap();
+	void update_tracks();
 	void update_neighbors();
 	void set_slope(TrackOrder &, float, float);
+	std::vector<R2C2::Track *> create_straight(const R2C2::Vector &, float, float, float);
 };
 
 #endif