m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

brush rotate: use angles from -179° to 180°

Browse Source
This commit is contained in:
Thomas Bernard 2020-01-07 22:49:24 +01:00
parent e152b75f4a
commit 266b092f63
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/brush_ops.c
View File

@ -947,7 +947,7 @@ void Rotate_brush_1_5(void)
// Souris effacée: Non // Souris effacée: Non
// //
{ {
char str[4]; char str[8];
short old_x; short old_x;
short old_y; short old_y;
short prev_state; short prev_state;
@ -973,18 +973,16 @@ void Rotate_brush_1_5(void)
{ {
// Angle from 0 to 2 PI // Angle from 0 to 2 PI
int dx = cursor_x - Brush_rotation_center_X; int dx = cursor_x - Brush_rotation_center_X;
int dy = cursor_y - Brush_rotation_center_Y; int dy = -(cursor_y - Brush_rotation_center_Y);
angle = 0.0 - atan2((double)dy, (double)dx); angle = atan2((double)dy, (double)dx);
if (angle < 0.0)
angle += M_2PI;
} }
if (Menu_is_visible) if (Menu_is_visible)
{ {
if (Config.Coords_rel) if (Config.Coords_rel)
{ {
Num2str((int)(angle*180.0/M_PI),str,3); snprintf(str, sizeof(str), "%4d", (int)(angle*180.0/M_PI));
Print_in_menu(str,7); Print_in_menu(str, 6);
} }
else else
Print_coordinates(); Print_coordinates();
@ -1016,7 +1014,7 @@ void Rotate_brush_0_5(void)
// Souris effacée: Non // Souris effacée: Non
// //
{ {
char str[4]; char str[8];
short old_x; short old_x;
short old_y; short old_y;
short computed_x=0; short computed_x=0;
@ -1047,18 +1045,16 @@ void Rotate_brush_0_5(void)
{ {
// Angle from 0 to 2 PI // Angle from 0 to 2 PI
int dx = cursor_x - Brush_rotation_center_X; int dx = cursor_x - Brush_rotation_center_X;
int dy = cursor_y - Brush_rotation_center_Y; int dy = -(cursor_y - Brush_rotation_center_Y);
angle = 0.0 - atan2((double)dy, (double)dx); angle = atan2((double)dy, (double)dx);
if (angle < 0.0)
angle += M_2PI;
} }
if (Menu_is_visible) if (Menu_is_visible)
{ {
if (Config.Coords_rel) if (Config.Coords_rel)
{ {
Num2str(Round(angle*180.0/M_PI),str,3); snprintf(str, sizeof(str), "%4d", (int)(angle*180.0/M_PI));
Print_in_menu(str,7); Print_in_menu(str, 6);
} }
else else
Print_coordinates(); Print_coordinates();
@ -1075,14 +1071,14 @@ void Rotate_brush_0_5(void)
computed_y=Brush_rotation_center_Y; computed_y=Brush_rotation_center_Y;
switch (Key_ANSI) switch (Key_ANSI)
{ {
case '6': angle= 0.0; computed_x++; break; case '6': angle = 0.0; computed_x++; break;
case '9': angle=M_PI*0.25; computed_x++; computed_y--; break; case '9': angle = M_PI*0.25; computed_x++; computed_y--; break;
case '8': angle=M_PI*0.5 ; computed_y--; break; case '8': angle = M_PI*0.5 ; computed_y--; break;
case '7': angle=M_PI*0.75; computed_x--; computed_y--; break; case '7': angle = M_PI*0.75; computed_x--; computed_y--; break;
case '4': angle=M_PI ; computed_x--; break; case '4': angle = M_PI ; computed_x--; break;
case '1': angle=M_PI*1.25; computed_x--; computed_y++; break; case '1': angle =-M_PI*0.75; computed_x--; computed_y++; break;
case '2': angle=M_PI*1.5 ; computed_y++; break; case '2': angle =-M_PI*0.5 ; computed_y++; break;
case '3': angle=M_PI*1.75; computed_x++; computed_y++; break; case '3': angle =-M_PI*0.25; computed_x++; computed_y++; break;
default : default :
angle_change=0; angle_change=0;
} }