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

n_pt_persp: Snap to grid; improved some guides

Browse source
This commit is contained in:
Bill Kendrick 2024-01-14 11:33:34 -08:00
parent 2766254db9
commit 4fbe005003
2 changed files with 59 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/CHANGES.txt
View file

@ -6,7 +6,7 @@ Copyright (c) 2002-2024
Various contributors (see below, and AUTHORS.txt) Various contributors (see below, and AUTHORS.txt)
https://tuxpaint.org/ https://tuxpaint.org/
2024.January.13 (0.9.32) 2024.January.14 (0.9.32)
* Improvements to Magic tools: * Improvements to Magic tools:
---------------------------- ----------------------------
* Support for complexity levels in Magic tools via the plugin API. * Support for complexity levels in Magic tools via the plugin API.

74
magic/src/n_pt_persp.c
View file

@ -13,7 +13,7 @@
by Bill Kendrick <bill@newbreedsoftware.com> by Bill Kendrick <bill@newbreedsoftware.com>
December 12, 2023 - January 13, 2024 December 12, 2023 - January 14, 2024
*/ */
@ -289,6 +289,9 @@ float oblqb_ang;
#define MIN_AXONOMETRIC_ANGLE (15.0 * M_PI / 180.0) #define MIN_AXONOMETRIC_ANGLE (15.0 * M_PI / 180.0)
#define MAX_AXONOMETRIC_ANGLE (75.0 * M_PI / 180.0) #define MAX_AXONOMETRIC_ANGLE (75.0 * M_PI / 180.0)
#define MIN_OBLIQUE_ANGLE (30.0 * M_PI / 180.0)
#define MAX_OBLIQUE_ANGLE (60.0 * M_PI / 180.0)
int line_start_x, line_start_y; int line_start_x, line_start_y;
float a2_valid_angle[8]; float a2_valid_angle[8];
float a3_valid_angle[8]; float a3_valid_angle[8];
@ -328,6 +331,8 @@ void n_pt_persp_set_size(magic_api * api, int which, int mode,
Uint8 size, SDL_Rect * update_rect); Uint8 size, SDL_Rect * update_rect);
void n_pt_persp_line_xor_callback(void *pointer, int tool, SDL_Surface * canvas, void n_pt_persp_line_xor_callback(void *pointer, int tool, SDL_Surface * canvas,
SDL_Surface * snapshot, int x, int y); SDL_Surface * snapshot, int x, int y);
void n_pt_persp_line_xor_thick_callback(void *pointer, int tool, SDL_Surface * canvas,
SDL_Surface * snapshot, int x, int y);
void n_pt_persp_line_callback(void *pointer, int tool, SDL_Surface * canvas, void n_pt_persp_line_callback(void *pointer, int tool, SDL_Surface * canvas,
SDL_Surface * snapshot, int x, int y); SDL_Surface * snapshot, int x, int y);
void n_pt_persp_switchin(magic_api * api, int which, int mode, void n_pt_persp_switchin(magic_api * api, int which, int mode,
@ -583,6 +588,9 @@ void n_pt_persp_click(magic_api * api, int which, int mode ATTRIBUTE_UNUSED,
fflush(stdout); fflush(stdout);
#endif #endif
x = (x / 10) * 10;
y = (y / 10) * 10;
tool = which_to_tool[which]; tool = which_to_tool[which];
pick = 0; pick = 0;
@ -753,6 +761,11 @@ void n_pt_persp_drag(magic_api * api, int which,
int i, x1, y1, x2, y2; int i, x1, y1, x2, y2;
float slope; float slope;
old_x = (old_x / 10) * 10;
old_y = (old_y / 10) * 10;
x = (x / 10) * 10;
y = (y / 10) * 10;
#ifdef DEBUG #ifdef DEBUG
printf("\nn_pt_persp_drag\n"); printf("\nn_pt_persp_drag\n");
printf("%d becomes %d (%s)\n", which, which_to_tool[which], tool_debug_names[which_to_tool[which]]); printf("%d becomes %d (%s)\n", which, which_to_tool[which], tool_debug_names[which_to_tool[which]]);
@ -1043,12 +1056,12 @@ void n_pt_persp_drag(magic_api * api, int which,
} }
oblq_ang = atan2f(canvas->h / 2 - y, x - canvas->w / 2); oblq_ang = atan2f(canvas->h / 2 - y, x - canvas->w / 2);
if (oblq_ang < MIN_AXONOMETRIC_ANGLE) { if (oblq_ang < MIN_OBLIQUE_ANGLE) {
oblq_ang = MIN_AXONOMETRIC_ANGLE; oblq_ang = MIN_OBLIQUE_ANGLE;
} else if (oblq_ang > MAX_AXONOMETRIC_ANGLE && oblq_ang < M_PI - MAX_AXONOMETRIC_ANGLE) { } else if (oblq_ang > MAX_OBLIQUE_ANGLE && oblq_ang < M_PI - MAX_OBLIQUE_ANGLE) {
oblq_ang = MAX_AXONOMETRIC_ANGLE; oblq_ang = MAX_OBLIQUE_ANGLE;
} else if (oblq_ang > M_PI - MIN_AXONOMETRIC_ANGLE) { } else if (oblq_ang > M_PI - MIN_OBLIQUE_ANGLE) {
oblq_ang = M_PI - MIN_AXONOMETRIC_ANGLE; oblq_ang = M_PI - MIN_OBLIQUE_ANGLE;
} }
#ifdef DEBUG #ifdef DEBUG
@ -1330,6 +1343,9 @@ void n_pt_persp_release(magic_api * api, int which,
fflush(stdout); fflush(stdout);
#endif #endif
x = (x / 10) * 10;
y = (y / 10) * 10;
which = which_to_tool[which]; which = which_to_tool[which];
if (which == TOOL_1PT_SELECT) { if (which == TOOL_1PT_SELECT) {
@ -1391,6 +1407,22 @@ void n_pt_persp_line_xor_callback(void *pointer, int tool ATTRIBUTE_UNUSED, SDL_
api->xorpixel(canvas, x + 1, y + 1); api->xorpixel(canvas, x + 1, y + 1);
} }
void n_pt_persp_line_xor_thick_callback(void *pointer, int tool ATTRIBUTE_UNUSED, SDL_Surface * canvas,
SDL_Surface * snapshot ATTRIBUTE_UNUSED, int x, int y)
{
int i, j;
magic_api *api = (magic_api *) pointer;
for (i = -3; i <= 3; i++) {
for (j = -3; j <= 3; j++) {
if (abs(i) == abs(j)) {
api->xorpixel(canvas, x + i, y + j);
}
}
}
}
void n_pt_persp_line_callback(void *pointer ATTRIBUTE_UNUSED, int tool ATTRIBUTE_UNUSED, void n_pt_persp_line_callback(void *pointer ATTRIBUTE_UNUSED, int tool ATTRIBUTE_UNUSED,
SDL_Surface * canvas, SDL_Surface * snapshot ATTRIBUTE_UNUSED, SDL_Surface * canvas, SDL_Surface * snapshot ATTRIBUTE_UNUSED,
int x, int y) int x, int y)
@ -1632,11 +1664,11 @@ void n_pt_persp_draw_points(magic_api * api, int tool, SDL_Surface * canvas) {
api->line((void *) api, tool, canvas, NULL, api->line((void *) api, tool, canvas, NULL,
canvas->w / 2 - x1, canvas->h / 2 - y1, canvas->w / 2 - x1, canvas->h / 2 - y1,
canvas->w / 2 + x1, canvas->h / 2 + y1, 12, canvas->w / 2 + x1, canvas->h / 2 + y1, 12,
n_pt_persp_line_xor_callback); n_pt_persp_line_xor_thick_callback);
api->line((void *) api, tool, canvas, NULL, api->line((void *) api, tool, canvas, NULL,
canvas->w / 2 - x1, canvas->h / 2 + y1, canvas->w / 2 - x1, canvas->h / 2 + y1,
canvas->w / 2 + x1, canvas->h / 2 - y1, 12, canvas->w / 2 + x1, canvas->h / 2 - y1, 12,
n_pt_persp_line_xor_callback); n_pt_persp_line_xor_thick_callback);
} else if (tool == TOOL_TRI_SELECT) { } else if (tool == TOOL_TRI_SELECT) {
/* Trimetric */ /* Trimetric */
@ -1649,20 +1681,30 @@ void n_pt_persp_draw_points(magic_api * api, int tool, SDL_Surface * canvas) {
/* angle 1 */ /* angle 1 */
x1 = cos(tri_ang[0]) * canvas->w; x1 = cos(tri_ang[0]) * canvas->w;
y1 = sin(tri_ang[0]) * canvas->w; y1 = sin(tri_ang[0]) * canvas->w;
for (i = 0; i < ((tri_ang_chosen == 0) * 3) + 1; i++) { if (tri_ang_chosen == 0) {
api->line((void *) api, tool, canvas, NULL, api->line((void *) api, tool, canvas, NULL,
canvas->w / 2 - x1 + i, canvas->h / 2 + y1, canvas->w / 2 - x1, canvas->h / 2 + y1,
canvas->w / 2 + x1 + i, canvas->h / 2 - y1, 12, canvas->w / 2 + x1, canvas->h / 2 - y1, 12,
n_pt_persp_line_xor_thick_callback);
} else {
api->line((void *) api, tool, canvas, NULL,
canvas->w / 2 - x1, canvas->h / 2 + y1,
canvas->w / 2 + x1, canvas->h / 2 - y1, 12,
n_pt_persp_line_xor_callback); n_pt_persp_line_xor_callback);
} }
/* angle 2 */ /* angle 2 */
x1 = cos(tri_ang[1]) * canvas->w; x1 = cos(tri_ang[1]) * canvas->w;
y1 = sin(tri_ang[1]) * canvas->w; y1 = sin(tri_ang[1]) * canvas->w;
for (i = 0; i < ((tri_ang_chosen == 1) * 3) + 1; i++) { if (tri_ang_chosen == 1) {
api->line((void *) api, tool, canvas, NULL, api->line((void *) api, tool, canvas, NULL,
canvas->w / 2 - x1 + i, canvas->h / 2 + y1, canvas->w / 2 - x1, canvas->h / 2 + y1,
canvas->w / 2 + x1 + i, canvas->h / 2 - y1, 12, canvas->w / 2 + x1, canvas->h / 2 - y1, 12,
n_pt_persp_line_xor_thick_callback);
} else {
api->line((void *) api, tool, canvas, NULL,
canvas->w / 2 - x1, canvas->h / 2 + y1,
canvas->w / 2 + x1, canvas->h / 2 - y1, 12,
n_pt_persp_line_xor_callback); n_pt_persp_line_xor_callback);
} }
} else if (tool == TOOL_OBLQ_SELECT || tool == TOOL_OBLQ_SELECT_ALT) { } else if (tool == TOOL_OBLQ_SELECT || tool == TOOL_OBLQ_SELECT_ALT) {
@ -1689,7 +1731,7 @@ void n_pt_persp_draw_points(magic_api * api, int tool, SDL_Surface * canvas) {
api->line((void *) api, tool, canvas, NULL, api->line((void *) api, tool, canvas, NULL,
canvas->w / 2 - x1, canvas->h / 2 + y1, canvas->w / 2 - x1, canvas->h / 2 + y1,
canvas->w / 2 + x1, canvas->h / 2 - y1, 12, canvas->w / 2 + x1, canvas->h / 2 - y1, 12,
n_pt_persp_line_xor_callback); n_pt_persp_line_xor_thick_callback);
} }
} }