X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fmeasure.h;h=c5696984fc32aba12b20ca37cfae8103efddff65;hb=eb9c7f5200da4f3f31b41233be8cee397cb6abb9;hp=84b1c832ea21a646052b05c432e07cdeb0c3da5f;hpb=c4a5973cff25a0dcdce11c0cbdf8e0fdc1ef4659;p=r2c2.git

diff --git a/source/designer/measure.h b/source/designer/measure.h
index 84b1c83..c569698 100644
--- a/source/designer/measure.h
+++ b/source/designer/measure.h
@@ -3,6 +3,7 @@
 
 #include <sigc++/sigc++.h>
 #include <msp/gl/renderable.h>
+#include "libr2c2/geometry.h"
 
 class Designer;
 
@@ -23,11 +24,10 @@ public:
 private:
 	Designer &designer;
 	R2C2::Vector pointer;
-	R2C2::Vector spoint;
-	float sdir;
+	R2C2::Snap ssnap;
 	float par_dist;
 	float perp_dist;
-	float adiff;
+	R2C2::Angle adiff;
 	State state;
 	Msp::GL::Mesh mesh;
 
@@ -35,14 +35,14 @@ public:
 	Measure(Designer &);
 	float get_parallel_distance() const { return par_dist; }
 	float get_perpendicular_distance() const { return perp_dist; }
-	float get_angle_difference() const { return adiff; }
+	const R2C2::Angle &get_angle_difference() const { return adiff; }
 	void start();
 	void button_press(float, float, unsigned);
 	void pointer_motion(float, float);
 	virtual void render(Msp::GL::Renderer &, const Msp::GL::Tag &) const;
 private:
 	void update_mesh();
-	void snap_to_tracks(R2C2::Vector &, float &);
+	void snap_to_tracks(R2C2::Snap &);
 };
 
 #endif