X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fmeasure.cpp;fp=source%2Fdesigner%2Fmeasure.cpp;h=c7fead1af705a4c60a8230b5e04750d8fd21cd5c;hb=7a36d396eded897c421424905b2c938d770df341;hp=69ada814e110ff53935e8151e70462762cf8e059;hpb=14116fc9bbbd118f0be564c4e14ec00bfab26d24;p=r2c2.git

diff --git a/source/designer/measure.cpp b/source/designer/measure.cpp
index 69ada81..c7fead1 100644
--- a/source/designer/measure.cpp
+++ b/source/designer/measure.cpp
@@ -29,7 +29,7 @@ void Measure::button_press(float gx, float gy, unsigned btn)
 	if(btn==1)
 	{
 		ssnap.position = Vector(gx, gy, 0);
-		ssnap.rotation = 0;
+		ssnap.rotation = Angle::zero();
 		snap_to_tracks(ssnap);
 
 		state = ACTIVE;
@@ -61,18 +61,12 @@ void Measure::pointer_motion(float gx, float gy)
 
 	if(state!=STARTING)
 	{
-		Vector delta(pointer.x-ssnap.position.x, pointer.y-ssnap.position.y, 0);
-		float c = cos(ssnap.rotation);
-		float s = sin(ssnap.rotation);
+		Vector delta = rotated_vector(pointer-ssnap.position, -ssnap.rotation);
 
-		par_dist = delta.x*c+delta.y*s;
-		perp_dist = delta.x*s-delta.y*c;
+		par_dist = delta.x;
+		perp_dist = delta.y;
 
-		adiff = sn.rotation-ssnap.rotation+M_PI;
-		while(adiff<-M_PI)
-			adiff += M_PI*2;
-		while(adiff>M_PI)
-			adiff -= M_PI*2;
+		adiff = wrap_balanced(sn.rotation-ssnap.rotation+Angle::half_turn());
 
 		update_mesh();
 
@@ -87,7 +81,7 @@ void Measure::render(GL::Renderer &renderer, const GL::Tag &) const
 
 	GL::Renderer::Push push(renderer);
 	const Vector &pos = (state==ACTIVE ? ssnap.position : pointer);
-	renderer.matrix_stack() *= GL::Matrix::translation(pos.x, pos.y, pos.z);
+	renderer.matrix_stack() *= GL::Matrix::translation(pos);
 
 	mesh.draw(renderer);
 }