From 16a92fb71a63173a729e06b8e1ab8abe432989de Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Sun, 15 Oct 2017 11:44:03 -0700 Subject: [PATCH] indent emboss.c --- magic/src/emboss.c | 134 ++++++++++++++++++++++++--------------------- 1 file changed, 72 insertions(+), 62 deletions(-) diff --git a/magic/src/emboss.c b/magic/src/emboss.c index 2abbd800b..0ffcbf43c 100644 --- a/magic/src/emboss.c +++ b/magic/src/emboss.c @@ -35,27 +35,24 @@ /* Our globals: */ -static Mix_Chunk * emboss_snd; +static Mix_Chunk *emboss_snd; // Prototypes Uint32 emboss_api_version(void); int emboss_init(magic_api * api); int emboss_get_tool_count(magic_api * api); -SDL_Surface * emboss_get_icon(magic_api * api, int which); -char * emboss_get_name(magic_api * api, int which); -char * emboss_get_description(magic_api * api, int which, int mode); +SDL_Surface *emboss_get_icon(magic_api * api, int which); +char *emboss_get_name(magic_api * api, int which); +char *emboss_get_description(magic_api * api, int which, int mode); void emboss_drag(magic_api * api, int which, SDL_Surface * canvas, - SDL_Surface * last, int ox, int oy, int x, int y, - SDL_Rect * update_rect); + SDL_Surface * last, int ox, int oy, int x, int y, SDL_Rect * update_rect); void emboss_click(magic_api * api, int which, int mode, - SDL_Surface * canvas, SDL_Surface * last, - int x, int y, SDL_Rect * update_rect); + SDL_Surface * canvas, SDL_Surface * last, int x, int y, SDL_Rect * update_rect); void emboss_release(magic_api * api, int which, - SDL_Surface * canvas, SDL_Surface * last, - int x, int y, SDL_Rect * update_rect); + SDL_Surface * canvas, SDL_Surface * last, int x, int y, SDL_Rect * update_rect); void emboss_shutdown(magic_api * api); void emboss_set_color(magic_api * api, Uint8 r, Uint8 g, Uint8 b); @@ -65,7 +62,10 @@ void emboss_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas int emboss_modes(magic_api * api, int which); -Uint32 emboss_api_version(void) { return(TP_MAGIC_API_VERSION); } +Uint32 emboss_api_version(void) +{ + return (TP_MAGIC_API_VERSION); +} // No setup required: @@ -73,118 +73,125 @@ int emboss_init(magic_api * api) { char fname[1024]; - snprintf(fname, sizeof(fname), "%s/sounds/magic/emboss.ogg", - api->data_directory); + snprintf(fname, sizeof(fname), "%s/sounds/magic/emboss.ogg", api->data_directory); emboss_snd = Mix_LoadWAV(fname); - return(1); + return (1); } // We have multiple tools: int emboss_get_tool_count(magic_api * api ATTRIBUTE_UNUSED) { - return(1); + return (1); } // Load our icons: -SDL_Surface * emboss_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED) +SDL_Surface *emboss_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED) { char fname[1024]; - snprintf(fname, sizeof(fname), "%s/images/magic/emboss.png", - api->data_directory); + snprintf(fname, sizeof(fname), "%s/images/magic/emboss.png", api->data_directory); - return(IMG_Load(fname)); + return (IMG_Load(fname)); } // Return our names, localized: -char * emboss_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) +char *emboss_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) { - return(strdup(gettext_noop("Emboss"))); + return (strdup(gettext_noop("Emboss"))); } // Return our descriptions, localized: -char * emboss_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) +char *emboss_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) { - return(strdup(gettext_noop("Click and drag the mouse to emboss the picture."))); + return (strdup(gettext_noop("Click and drag the mouse to emboss the picture."))); } // Do the effect: -static void do_emboss(void * ptr, int which ATTRIBUTE_UNUSED, SDL_Surface * canvas, SDL_Surface * last, - int x, int y) +static void do_emboss(void *ptr, int which ATTRIBUTE_UNUSED, SDL_Surface * canvas, SDL_Surface * last, int x, int y) { - magic_api * api = (magic_api *) ptr; + magic_api *api = (magic_api *) ptr; int xx, yy; - Uint8 r1, g1, b1, - r2, g2, b2; + Uint8 r1, g1, b1, r2, g2, b2; int r, g, b; float h, s, v; int avg1, avg2; for (yy = -16; yy < 16; yy++) - { - for (xx = -16; xx < 16; xx++) { - if (api->in_circle(xx, yy, 16)) - { - if (!api->touched(x + xx, y + yy)) + for (xx = -16; xx < 16; xx++) { - SDL_GetRGB(api->getpixel(last, x + xx, y + yy), last->format, &r1, &g1, &b1); - SDL_GetRGB(api->getpixel(last, x + xx + 2, y + yy + 2), last->format, &r2, &g2, &b2); + if (api->in_circle(xx, yy, 16)) + { + if (!api->touched(x + xx, y + yy)) + { + SDL_GetRGB(api->getpixel(last, x + xx, y + yy), last->format, &r1, &g1, &b1); + SDL_GetRGB(api->getpixel(last, x + xx + 2, y + yy + 2), last->format, &r2, &g2, &b2); - avg1 = (r1 + g1 + b1) / 3; - avg2 = (r2 + g2 + b2) / 3; + avg1 = (r1 + g1 + b1) / 3; + avg2 = (r2 + g2 + b2) / 3; - api->rgbtohsv(r1, g1, b1, &h, &s, &v); + api->rgbtohsv(r1, g1, b1, &h, &s, &v); - r = 128 + (((avg1 - avg2) * 3) / 2); - if (r < 0) r = 0; - if (r > 255) r = 255; - g = b = r; + r = 128 + (((avg1 - avg2) * 3) / 2); + if (r < 0) + r = 0; + if (r > 255) + r = 255; + g = b = r; - v = (r / 255.0); + v = (r / 255.0); - api->hsvtorgb(h, s, v, &r1, &g1, &b1); + api->hsvtorgb(h, s, v, &r1, &g1, &b1); - api->putpixel(canvas, x + xx, y + yy, SDL_MapRGB(canvas->format, r1, g1, b1)); + api->putpixel(canvas, x + xx, y + yy, SDL_MapRGB(canvas->format, r1, g1, b1)); + } + } } - } } - } } // Affect the canvas on drag: void emboss_drag(magic_api * api, int which, SDL_Surface * canvas, - SDL_Surface * last, int ox, int oy, int x, int y, - SDL_Rect * update_rect) + SDL_Surface * last, int ox, int oy, int x, int y, SDL_Rect * update_rect) { - api->line((void *) api, which, canvas, last, ox, oy, x, y, 1, do_emboss); + api->line((void *)api, which, canvas, last, ox, oy, x, y, 1, do_emboss); - if (ox > x) { int tmp = ox; ox = x; x = tmp; } - if (oy > y) { int tmp = oy; oy = y; y = tmp; } + if (ox > x) + { + int tmp = ox; + + ox = x; + x = tmp; + } + if (oy > y) + { + int tmp = oy; + + oy = y; + y = tmp; + } update_rect->x = ox - 16; update_rect->y = oy - 16; update_rect->w = (x + 16) - update_rect->x; update_rect->h = (y + 16) - update_rect->h; - api->playsound(emboss_snd, - (x * 255) / canvas->w, 255); + api->playsound(emboss_snd, (x * 255) / canvas->w, 255); } // Affect the canvas on click: void emboss_click(magic_api * api, int which, int mode ATTRIBUTE_UNUSED, - SDL_Surface * canvas, SDL_Surface * last, - int x, int y, SDL_Rect * update_rect) + SDL_Surface * canvas, SDL_Surface * last, int x, int y, SDL_Rect * update_rect) { emboss_drag(api, which, canvas, last, x, y, x, y, update_rect); } // Affect the canvas on release: void emboss_release(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, - SDL_Surface * canvas ATTRIBUTE_UNUSED, SDL_Surface * last ATTRIBUTE_UNUSED, - int x ATTRIBUTE_UNUSED, int y ATTRIBUTE_UNUSED, SDL_Rect * update_rect ATTRIBUTE_UNUSED) + SDL_Surface * canvas ATTRIBUTE_UNUSED, SDL_Surface * last ATTRIBUTE_UNUSED, + int x ATTRIBUTE_UNUSED, int y ATTRIBUTE_UNUSED, SDL_Rect * update_rect ATTRIBUTE_UNUSED) { } @@ -196,7 +203,8 @@ void emboss_shutdown(magic_api * api ATTRIBUTE_UNUSED) } // Record the color from Tux Paint: -void emboss_set_color(magic_api * api ATTRIBUTE_UNUSED, Uint8 r ATTRIBUTE_UNUSED, Uint8 g ATTRIBUTE_UNUSED, Uint8 b ATTRIBUTE_UNUSED) +void emboss_set_color(magic_api * api ATTRIBUTE_UNUSED, Uint8 r ATTRIBUTE_UNUSED, Uint8 g ATTRIBUTE_UNUSED, + Uint8 b ATTRIBUTE_UNUSED) { } @@ -206,15 +214,17 @@ int emboss_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE return 0; } -void emboss_switchin(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED) +void emboss_switchin(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, + SDL_Surface * canvas ATTRIBUTE_UNUSED) { } -void emboss_switchout(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED) +void emboss_switchout(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, + SDL_Surface * canvas ATTRIBUTE_UNUSED) { } int emboss_modes(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) { - return(MODE_PAINT); /* FIXME - Can also be turned into a full-image effect */ + return (MODE_PAINT); /* FIXME - Can also be turned into a full-image effect */ }