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

indent fill.c

Browse source
This commit is contained in:
Bill Kendrick 2017-10-15 11:44:35 -07:00
parent ce8121301a
commit 0608ce4c34
1 changed files with 79 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

65
magic/src/fill.c
View file

@ -44,10 +44,8 @@ static Uint8 fill_r, fill_g, fill_b;
/* Local function prototypes: */ /* Local function prototypes: */
static int colors_close(magic_api * api, SDL_Surface * canvas, static int colors_close(magic_api * api, SDL_Surface * canvas, Uint32 c1, Uint32 c2);
Uint32 c1, Uint32 c2); static void do_flood_fill(magic_api * api, SDL_Surface * canvas, int x, int y, Uint32 cur_colr, Uint32 old_colr);
static void do_flood_fill(magic_api * api, SDL_Surface * canvas, int x, int y,
Uint32 cur_colr, Uint32 old_colr);
int fill_modes(magic_api * api, int which); int fill_modes(magic_api * api, int which);
void fill_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas); void fill_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas);
void fill_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas); void fill_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas);
@ -55,14 +53,11 @@ int fill_requires_colors(magic_api * api, int which);
void fill_set_color(magic_api * api, Uint8 r, Uint8 g, Uint8 b); void fill_set_color(magic_api * api, Uint8 r, Uint8 g, Uint8 b);
void fill_shutdown(magic_api * api); void fill_shutdown(magic_api * api);
void fill_release(magic_api * api, int which, void fill_release(magic_api * api, int which,
SDL_Surface * canvas, SDL_Surface * last, SDL_Surface * canvas, SDL_Surface * last, int x, int y, SDL_Rect * update_rect);
int x, int y, SDL_Rect * update_rect);
void fill_click(magic_api * api, int which, int mode, void fill_click(magic_api * api, int which, int mode,
SDL_Surface * canvas, SDL_Surface * last, SDL_Surface * canvas, SDL_Surface * last, int x, int y, SDL_Rect * update_rect);
int x, int y, SDL_Rect * update_rect);
void fill_drag(magic_api * api, int which, SDL_Surface * canvas, void fill_drag(magic_api * api, int which, SDL_Surface * canvas,
SDL_Surface * last, int ox, int oy, int x, int y, SDL_Surface * last, int ox, int oy, int x, int y, SDL_Rect * update_rect);
SDL_Rect * update_rect);
char *fill_get_description(magic_api * api, int which, int mode); char *fill_get_description(magic_api * api, int which, int mode);
char *fill_get_name(magic_api * api, int which); char *fill_get_name(magic_api * api, int which);
int fill_get_tool_count(magic_api * api); int fill_get_tool_count(magic_api * api);
@ -76,14 +71,16 @@ int fill_init(magic_api * api)
{ {
char fname[1024]; char fname[1024];
snprintf(fname, sizeof(fname), "%s/sounds/magic/fill.wav", snprintf(fname, sizeof(fname), "%s/sounds/magic/fill.wav", api->data_directory);
api->data_directory);
fill_snd = Mix_LoadWAV(fname); fill_snd = Mix_LoadWAV(fname);
return (1); return (1);
} }
Uint32 fill_api_version(void) { return(TP_MAGIC_API_VERSION); } Uint32 fill_api_version(void)
{
return (TP_MAGIC_API_VERSION);
}
// We have multiple tools: // We have multiple tools:
int fill_get_tool_count(magic_api * api ATTRIBUTE_UNUSED) int fill_get_tool_count(magic_api * api ATTRIBUTE_UNUSED)
@ -96,8 +93,7 @@ SDL_Surface * fill_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
{ {
char fname[1024]; char fname[1024];
snprintf(fname, sizeof(fname), "%s/images/magic/fill.png", snprintf(fname, sizeof(fname), "%s/images/magic/fill.png", api->data_directory);
api->data_directory);
return (IMG_Load(fname)); return (IMG_Load(fname));
} }
@ -111,15 +107,14 @@ char * fill_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSE
// Return our descriptions, localized: // Return our descriptions, localized:
char *fill_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) char *fill_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{ {
return(strdup(gettext_noop( return (strdup(gettext_noop("Click in the picture to fill that area with color.")));
"Click in the picture to fill that area with color.")));
} }
// Affect the canvas on drag: // Affect the canvas on drag:
void fill_drag(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED, void fill_drag(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED,
SDL_Surface * last ATTRIBUTE_UNUSED, int ox ATTRIBUTE_UNUSED, int oy ATTRIBUTE_UNUSED, int x ATTRIBUTE_UNUSED, int y ATTRIBUTE_UNUSED, SDL_Surface * last ATTRIBUTE_UNUSED, int ox ATTRIBUTE_UNUSED, int oy ATTRIBUTE_UNUSED,
SDL_Rect * update_rect ATTRIBUTE_UNUSED) int x ATTRIBUTE_UNUSED, int y ATTRIBUTE_UNUSED, SDL_Rect * update_rect ATTRIBUTE_UNUSED)
{ {
} }
@ -128,9 +123,7 @@ void fill_click(magic_api * api, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_
SDL_Surface * canvas ATTRIBUTE_UNUSED, SDL_Surface * last ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED, SDL_Surface * last ATTRIBUTE_UNUSED,
int x, int y, SDL_Rect * update_rect) int x, int y, SDL_Rect * update_rect)
{ {
do_flood_fill(api, canvas, x, y, SDL_MapRGB(canvas->format, do_flood_fill(api, canvas, x, y, SDL_MapRGB(canvas->format, fill_r, fill_g, fill_b), api->getpixel(canvas, x, y));
fill_r, fill_g, fill_b),
api->getpixel(canvas, x, y));
update_rect->x = 0; update_rect->x = 0;
update_rect->y = 0; update_rect->y = 0;
@ -164,8 +157,7 @@ int fill_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_U
} }
static int colors_close(magic_api * api, SDL_Surface * canvas, static int colors_close(magic_api * api, SDL_Surface * canvas, Uint32 c1, Uint32 c2)
Uint32 c1, Uint32 c2)
{ {
Uint8 r1, g1, b1, r2, g2, b2; Uint8 r1, g1, b1, r2, g2, b2;
@ -178,6 +170,7 @@ static int colors_close(magic_api * api, SDL_Surface * canvas,
else else
{ {
double r, g, b; double r, g, b;
SDL_GetRGB(c1, canvas->format, &r1, &g1, &b1); SDL_GetRGB(c1, canvas->format, &r1, &g1, &b1);
SDL_GetRGB(c2, canvas->format, &r2, &g2, &b2); SDL_GetRGB(c2, canvas->format, &r2, &g2, &b2);
@ -198,8 +191,7 @@ static int colors_close(magic_api * api, SDL_Surface * canvas,
} }
static void do_flood_fill(magic_api * api, SDL_Surface * canvas, int x, int y, static void do_flood_fill(magic_api * api, SDL_Surface * canvas, int x, int y, Uint32 cur_colr, Uint32 old_colr)
Uint32 cur_colr, Uint32 old_colr)
{ {
int fillL, fillR, i, in_line; int fillL, fillR, i, in_line;
static unsigned char prog_anim; static unsigned char prog_anim;
@ -229,10 +221,7 @@ static void do_flood_fill(magic_api * api, SDL_Surface * canvas, int x, int y,
api->putpixel(canvas, fillL, y, cur_colr); api->putpixel(canvas, fillL, y, cur_colr);
fillL--; fillL--;
in_line = in_line = (fillL < 0) ? 0 : colors_close(api, canvas, api->getpixel(canvas, fillL, y), old_colr);
(fillL < 0) ? 0 : colors_close(api, canvas,
api->getpixel(canvas, fillL, y),
old_colr);
} }
fillL++; fillL++;
@ -245,9 +234,7 @@ static void do_flood_fill(magic_api * api, SDL_Surface * canvas, int x, int y,
api->putpixel(canvas, fillR, y, cur_colr); api->putpixel(canvas, fillR, y, cur_colr);
fillR++; fillR++;
in_line = (fillR >= canvas->w) ? 0 : colors_close(api, canvas, in_line = (fillR >= canvas->w) ? 0 : colors_close(api, canvas, api->getpixel(canvas, fillR, y), old_colr);
api->getpixel(canvas, fillR, y),
old_colr);
} }
fillR--; fillR--;
@ -257,21 +244,21 @@ static void do_flood_fill(magic_api * api, SDL_Surface * canvas, int x, int y,
for (i = fillL; i <= fillR; i++) for (i = fillL; i <= fillR; i++)
{ {
if (y > 0 && colors_close(api, canvas, api->getpixel(canvas, i, y - 1), if (y > 0 && colors_close(api, canvas, api->getpixel(canvas, i, y - 1), old_colr))
old_colr))
do_flood_fill(api, canvas, i, y - 1, cur_colr, old_colr); do_flood_fill(api, canvas, i, y - 1, cur_colr, old_colr);
if (y < canvas->h if (y < canvas->h && colors_close(api, canvas, api->getpixel(canvas, i, y + 1), old_colr))
&& colors_close(api, canvas, api->getpixel(canvas, i, y + 1), old_colr))
do_flood_fill(api, canvas, i, y + 1, cur_colr, old_colr); do_flood_fill(api, canvas, i, y + 1, cur_colr, old_colr);
} }
} }
void fill_switchin(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED) void fill_switchin(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED,
SDL_Surface * canvas ATTRIBUTE_UNUSED)
{ {
} }
void fill_switchout(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED) void fill_switchout(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED,
SDL_Surface * canvas ATTRIBUTE_UNUSED)
{ {
} }