notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2-pt persp: mend vertical line direction flip

Browse source
This commit is contained in:
Bill Kendrick 2023-12-22 01:38:33 -08:00
parent 920026b14b
commit b20b4531c4
1 changed files with 2 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
magic/src/n_pt_persp.c
View file

@ -448,12 +448,6 @@ void n_pt_persp_drag(magic_api * api, int which,
x1, y1, x2, y2, 2, x1, y1, x2, y2, 2,
n_pt_persp_line_xor_callback); n_pt_persp_line_xor_callback);
} }
/*
api->line((void *) api, which, canvas, NULL,
x, y, a2_pt_x[i], a2_pt_y[i], 5,
n_pt_persp_line_xor_callback);
*/
} }
} else if (which == TOOL_3PT_DRAW) { } else if (which == TOOL_3PT_DRAW) {
/* 3-point perspective - draw */ /* 3-point perspective - draw */
@ -564,9 +558,7 @@ void n_pt_persp_work(magic_api * api, int which,
x2 = line_start_x + cos(a2_valid_angle[best_angle_idx]) * 1000; x2 = line_start_x + cos(a2_valid_angle[best_angle_idx]) * 1000;
y2 = line_start_y + sin(a2_valid_angle[best_angle_idx]) * 1000; y2 = line_start_y + sin(a2_valid_angle[best_angle_idx]) * 1000;
// printf("angle #%d (%d)\n", best_angle_idx, (int) (a2_valid_angle[best_angle_idx] * 180.0 / M_PI)); if (abs(x2 - x1) >= 2) {
if (x2 != x1) {
slope = ((float) y2 - (float) y1) / ((float) x2 - (float) x1); slope = ((float) y2 - (float) y1) / ((float) x2 - (float) x1);
x2 = x; x2 = x;
y2 = line_start_y + (slope * (x - line_start_x)); y2 = line_start_y + (slope * (x - line_start_x));
@ -579,9 +571,8 @@ void n_pt_persp_work(magic_api * api, int which,
x2 = ((y - line_start_y) / slope) + line_start_x; x2 = ((y - line_start_y) / slope) + line_start_x;
} }
} }
/* FIXME: Sometimes the line goes off in the wrong direction! */
} else { } else {
x2 = x; x2 = x1;
y2 = y; y2 = y;
} }
} else if (which == TOOL_3PT_DRAW) { } else if (which == TOOL_3PT_DRAW) {