X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fmanipulator.h;h=1c46af6b6fd4c4eeae53bd197c87a198723f9acc;hb=51d3c122fb489f9e3f00060f885f00c1fae7ceb5;hp=cb4759ac7ad1a671e757b598cc67945199ccbba0;hpb=f950f5a77714a155e57c868101911e181a617818;p=r2c2.git

diff --git a/source/designer/manipulator.h b/source/designer/manipulator.h
index cb4759a..1c46af6 100644
--- a/source/designer/manipulator.h
+++ b/source/designer/manipulator.h
@@ -2,6 +2,7 @@
 #define MANIPULATOR_H_
 
 #include <sigc++/sigc++.h>
+#include "libr2c2/geometry.h"
 
 class Designer;
 class Selection;
@@ -22,7 +23,7 @@ private:
 	{
 		R2C2::Object *object;
 		R2C2::Vector pos;
-		float rot;
+		R2C2::Angle rot;
 
 		MObject(R2C2::Object *);
 	};
@@ -50,10 +51,10 @@ private:
 	R2C2::Vector gpointer;
 	Mode mode;
 	R2C2::Vector move_origin;
-	float angle;
-	float rot_origin;
+	R2C2::Angle angle;
+	R2C2::Angle rot_origin;
 	float elev_origin;
-	std::set<R2C2::Track *> neighbors;
+	std::set<R2C2::Object *> neighbors;
 	std::vector<R2C2::Track *> extend_tracks;
 
 public:
@@ -75,7 +76,7 @@ private:
 	void update_objects();
 	void update_neighbors();
 	void set_slope(TrackOrder &, float, float);
-	std::vector<R2C2::Track *> create_straight(const R2C2::Vector &, float, float, float);
+	std::vector<R2C2::Track *> create_straight(const R2C2::Vector &, const R2C2::Angle &, float, float);
 };
 
 #endif