From 247be68e46eb480c2c24a8351b14729609e901b0 Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Sun, 15 Oct 2017 11:49:17 -0700 Subject: [PATCH] indent realrainbow.c --- magic/src/realrainbow.c | 267 +++++++++++++++++++--------------------- 1 file changed, 129 insertions(+), 138 deletions(-) diff --git a/magic/src/realrainbow.c b/magic/src/realrainbow.c index c5b712454..d4c9ece7e 100644 --- a/magic/src/realrainbow.c +++ b/magic/src/realrainbow.c @@ -20,48 +20,39 @@ FIXME: #include "tp_magic_api.h" -Mix_Chunk * realrainbow_snd; +Mix_Chunk *realrainbow_snd; int realrainbow_x1, realrainbow_y1, realrainbow_x2, realrainbow_y2; SDL_Rect realrainbow_rect; -SDL_Surface * realrainbow_colors[2]; +SDL_Surface *realrainbow_colors[2]; Uint8 realrainbow_blendr, realrainbow_blendg, realrainbow_blendb, realrainbow_blenda; void realrainbow_arc(magic_api * api, int which, SDL_Surface * canvas, SDL_Surface * last, - int x1, int y1, int x2, int y2, - int fulldraw, SDL_Rect * update_rect); -static void realrainbow_linecb(void * ptr, int which, - SDL_Surface * canvas, SDL_Surface * last, - int x, int y); + int x1, int y1, int x2, int y2, int fulldraw, SDL_Rect * update_rect); +static void realrainbow_linecb(void *ptr, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y); Uint32 realrainbow_api_version(void); int realrainbow_init(magic_api * api); int realrainbow_get_tool_count(magic_api * api); -SDL_Surface * realrainbow_get_icon(magic_api * api, int which); -char * realrainbow_get_name(magic_api * api, int which); -char * realrainbow_get_description(magic_api * api, int which, int mode); +SDL_Surface *realrainbow_get_icon(magic_api * api, int which); +char *realrainbow_get_name(magic_api * api, int which); +char *realrainbow_get_description(magic_api * api, int which, int mode); int realrainbow_modes(magic_api * api, int which); int realrainbow_requires_colors(magic_api * api, int which); void realrainbow_shutdown(magic_api * api); void realrainbow_set_color(magic_api * api, Uint8 r, Uint8 g, Uint8 b); void realrainbow_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 realrainbow_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 * canvas, SDL_Surface * last, int ox, int oy, int x, int y, SDL_Rect * update_rect); void realrainbow_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 realrainbow_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas); void realrainbow_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas); Uint32 realrainbow_api_version(void) { - return(TP_MAGIC_API_VERSION); + return (TP_MAGIC_API_VERSION); } int realrainbow_init(magic_api * api) @@ -71,60 +62,60 @@ int realrainbow_init(magic_api * api) snprintf(fname, sizeof(fname), "%s/images/magic/realrainbow-colors.png", api->data_directory); realrainbow_colors[0] = IMG_Load(fname); if (realrainbow_colors[0] == NULL) - return(0); + return (0); snprintf(fname, sizeof(fname), "%s/images/magic/realrainbow-roygbiv-colors.png", api->data_directory); realrainbow_colors[1] = IMG_Load(fname); if (realrainbow_colors[1] == NULL) - return(0); + return (0); - snprintf(fname, sizeof(fname), "%s/sounds/magic/realrainbow.ogg", - api->data_directory); + snprintf(fname, sizeof(fname), "%s/sounds/magic/realrainbow.ogg", api->data_directory); realrainbow_snd = Mix_LoadWAV(fname); - return(1); + return (1); } int realrainbow_get_tool_count(magic_api * api ATTRIBUTE_UNUSED) { - return(2); + return (2); } -SDL_Surface * realrainbow_get_icon(magic_api * api, int which) +SDL_Surface *realrainbow_get_icon(magic_api * api, int which) { char fname[1024]; if (which == 0) - snprintf(fname, sizeof(fname), "%s/images/magic/realrainbow.png", - api->data_directory); + snprintf(fname, sizeof(fname), "%s/images/magic/realrainbow.png", api->data_directory); else - snprintf(fname, sizeof(fname), "%s/images/magic/realrainbow-roygbiv.png", - api->data_directory); + snprintf(fname, sizeof(fname), "%s/images/magic/realrainbow-roygbiv.png", api->data_directory); - return(IMG_Load(fname)); + return (IMG_Load(fname)); } -char * realrainbow_get_name(magic_api * api ATTRIBUTE_UNUSED, int which) +char *realrainbow_get_name(magic_api * api ATTRIBUTE_UNUSED, int which) { if (which == 0) - return(strdup(gettext_noop("Real Rainbow"))); + return (strdup(gettext_noop("Real Rainbow"))); else - return(strdup(gettext_noop("ROYGBIV Rainbow"))); + return (strdup(gettext_noop("ROYGBIV Rainbow"))); } -char * realrainbow_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED) +char *realrainbow_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, + int mode ATTRIBUTE_UNUSED) { - return(strdup(gettext_noop("Click where you want your rainbow to start, drag to where you want it to end, and then let go to draw a rainbow."))); + return (strdup + (gettext_noop + ("Click where you want your rainbow to start, drag to where you want it to end, and then let go to draw a rainbow."))); } int realrainbow_modes(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) { - return(MODE_PAINT_WITH_PREVIEW); + return (MODE_PAINT_WITH_PREVIEW); } int realrainbow_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) { - return(0); + return (0); } void realrainbow_shutdown(magic_api * api ATTRIBUTE_UNUSED) @@ -137,14 +128,14 @@ void realrainbow_shutdown(magic_api * api ATTRIBUTE_UNUSED) Mix_FreeChunk(realrainbow_snd); } -void realrainbow_set_color(magic_api * api ATTRIBUTE_UNUSED, Uint8 r ATTRIBUTE_UNUSED, Uint8 g ATTRIBUTE_UNUSED, Uint8 b ATTRIBUTE_UNUSED) +void realrainbow_set_color(magic_api * api ATTRIBUTE_UNUSED, Uint8 r ATTRIBUTE_UNUSED, Uint8 g ATTRIBUTE_UNUSED, + Uint8 b ATTRIBUTE_UNUSED) { } void realrainbow_click(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED, SDL_Surface * last ATTRIBUTE_UNUSED, - int x, int y, - SDL_Rect * update_rect ATTRIBUTE_UNUSED) + int x, int y, SDL_Rect * update_rect ATTRIBUTE_UNUSED) { realrainbow_x1 = x; realrainbow_y1 = y; @@ -157,8 +148,7 @@ void realrainbow_click(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNU void realrainbow_drag(magic_api * api, int which, SDL_Surface * canvas, SDL_Surface * last, - int ox ATTRIBUTE_UNUSED, int oy ATTRIBUTE_UNUSED, int x, int y, - SDL_Rect * update_rect) + int ox ATTRIBUTE_UNUSED, int oy ATTRIBUTE_UNUSED, int x, int y, SDL_Rect * update_rect) { int rx1, ry1, rx2, ry2; SDL_Rect rect; @@ -168,7 +158,8 @@ void realrainbow_drag(magic_api * api, int which, SDL_BlitSurface(last, &realrainbow_rect, canvas, &realrainbow_rect); - realrainbow_arc(api, which, canvas, last, realrainbow_x1, realrainbow_y1, realrainbow_x2, realrainbow_y2, 0, update_rect); + realrainbow_arc(api, which, canvas, last, realrainbow_x1, realrainbow_y1, realrainbow_x2, realrainbow_y2, 0, + update_rect); memcpy(&rect, &realrainbow_rect, sizeof(SDL_Rect)); memcpy(&realrainbow_rect, update_rect, sizeof(SDL_Rect)); @@ -194,9 +185,7 @@ void realrainbow_drag(magic_api * api, int which, } void realrainbow_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) { int rx1, ry1, rx2, ry2; SDL_Rect rect; @@ -206,7 +195,8 @@ void realrainbow_release(magic_api * api, int which, SDL_BlitSurface(last, &realrainbow_rect, canvas, &realrainbow_rect); - realrainbow_arc(api, which, canvas, last, realrainbow_x1, realrainbow_y1, realrainbow_x2, realrainbow_y2, 1, update_rect); + realrainbow_arc(api, which, canvas, last, realrainbow_x1, realrainbow_y1, realrainbow_x2, realrainbow_y2, 1, + update_rect); memcpy(&rect, &realrainbow_rect, sizeof(SDL_Rect)); memcpy(&realrainbow_rect, update_rect, sizeof(SDL_Rect)); @@ -233,16 +223,19 @@ void realrainbow_release(magic_api * api, int which, api->playsound(realrainbow_snd, 128, 255); } -void realrainbow_switchin(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED) +void realrainbow_switchin(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, + SDL_Surface * canvas ATTRIBUTE_UNUSED) { } -void realrainbow_switchout(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED) +void realrainbow_switchout(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, + SDL_Surface * canvas ATTRIBUTE_UNUSED) { } -void realrainbow_arc(magic_api * api, int which, SDL_Surface * canvas, SDL_Surface * last, int x1, int y1, int x2, int y2, int fulldraw, SDL_Rect * update_rect) +void realrainbow_arc(magic_api * api, int which, SDL_Surface * canvas, SDL_Surface * last, int x1, int y1, int x2, + int y2, int fulldraw, SDL_Rect * update_rect) { int lowx, lowy, hix, hiy, xm, ym, xc, yc, r, a1, atan2_a, atan2_b; int a, oa, ox, oy, nx, ny, step, thick, rr, done; @@ -250,71 +243,71 @@ void realrainbow_arc(magic_api * api, int which, SDL_Surface * canvas, SDL_Surfa int colorindex; if (abs(x2 - x1) < 50) - { - if (x2 > x1) - x2 = x1 + 50; - else - x2 = x1 - 50; - } + { + if (x2 > x1) + x2 = x1 + 50; + else + x2 = x1 - 50; + } if (y1 == y2) - { - xc = x1 + (x2 - x1) / 2; - yc = y1; - r = abs(xc - x1); - - a1 = 0; - theta = -180; - } - else - { - if (y1 > y2) { - lowx = x1; - lowy = y1; - hix = x2; - hiy = y2; - } - else - { - lowx = x2; - lowy = y2; - hix = x1; - hiy = y1; - } + xc = x1 + (x2 - x1) / 2; + yc = y1; + r = abs(xc - x1); - xm = (lowx + hix) / 2; - ym = (lowy + hiy) / 2; - - if (hix == lowx) - return; - - slope = (float)(hiy - lowy) / (float)(hix - lowx); - - yc = lowy; - xc = slope * (ym - yc) + xm; - - r = abs(xc - lowx); - atan2_b = hix - xc; - atan2_a = hiy - yc; - theta = atan2(atan2_a, atan2_b) * (180.0 / M_PI); - - if (slope > 0) a1 = 0; - else - a1 = -180; - } + theta = -180; + } + else + { + if (y1 > y2) + { + lowx = x1; + lowy = y1; + hix = x2; + hiy = y2; + } + else + { + lowx = x2; + lowy = y2; + hix = x1; + hiy = y1; + } + + xm = (lowx + hix) / 2; + ym = (lowy + hiy) / 2; + + if (hix == lowx) + return; + + slope = (float)(hiy - lowy) / (float)(hix - lowx); + + yc = lowy; + xc = slope * (ym - yc) + xm; + + r = abs(xc - lowx); + atan2_b = hix - xc; + atan2_a = hiy - yc; + theta = atan2(atan2_a, atan2_b) * (180.0 / M_PI); + + if (slope > 0) + a1 = 0; + else + a1 = -180; + } if (fulldraw) - { - step = 1; - /* thick = (r / 5); */ - } + { + step = 1; + /* thick = (r / 5); */ + } else - { - step = 30; - /* thick = 1; */ - } + { + step = 30; + /* thick = 1; */ + } thick = (r / 5); if (theta < a1) @@ -324,52 +317,51 @@ void realrainbow_arc(magic_api * api, int which, SDL_Surface * canvas, SDL_Surfa oa = a1; for (a = (a1 + step); done < 2; a = a + step) - { - for (rr = r - (thick / 2); rr <= r + (thick / 2); rr++) { - ox = (rr * cos(oa * M_PI / 180.0)) + xc; - oy = (rr * sin(oa * M_PI / 180.0)) + yc; + for (rr = r - (thick / 2); rr <= r + (thick / 2); rr++) + { + ox = (rr * cos(oa * M_PI / 180.0)) + xc; + oy = (rr * sin(oa * M_PI / 180.0)) + yc; - nx = (rr * cos(a * M_PI / 180.0)) + xc; - ny = (rr * sin(a * M_PI / 180.0)) + yc; + nx = (rr * cos(a * M_PI / 180.0)) + xc; + ny = (rr * sin(a * M_PI / 180.0)) + yc; - colorindex = realrainbow_colors[which]->h - 1 - (((rr - r + (thick / 2)) * realrainbow_colors[which]->h) / thick); + colorindex = + realrainbow_colors[which]->h - 1 - (((rr - r + (thick / 2)) * realrainbow_colors[which]->h) / thick); - SDL_GetRGBA(api->getpixel(realrainbow_colors[which], 0, colorindex), - realrainbow_colors[which]->format, &realrainbow_blendr, &realrainbow_blendg, &realrainbow_blendb, &realrainbow_blenda); + SDL_GetRGBA(api->getpixel(realrainbow_colors[which], 0, colorindex), + realrainbow_colors[which]->format, &realrainbow_blendr, &realrainbow_blendg, &realrainbow_blendb, + &realrainbow_blenda); - if (!fulldraw) - realrainbow_blenda = 255; + if (!fulldraw) + realrainbow_blenda = 255; - api->line((void *) api, 0, canvas, last, ox, oy, nx, ny, 1, realrainbow_linecb); + api->line((void *)api, 0, canvas, last, ox, oy, nx, ny, 1, realrainbow_linecb); + } + + oa = a; + + if ((step > 0 && a + step > theta) || (step < 0 && a + step < theta)) + { + done++; + a = theta - step; + } } - oa = a; - - if ((step > 0 && a + step > theta) || - (step < 0 && a + step < theta)) - { - done++; - a = theta - step; - } - } - update_rect->y = yc - r - thick - 2; update_rect->h = r + thick * 2 + 4; update_rect->x = xc - r - thick; update_rect->w = r * 2 + thick * 2; } -static void realrainbow_linecb(void * ptr, int which ATTRIBUTE_UNUSED, - SDL_Surface * canvas, SDL_Surface * last, - int x, int y) +static void realrainbow_linecb(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; Uint8 origr, origg, origb; Uint8 newr, newg, newb; - SDL_GetRGB(api->getpixel(last, x, y), - last->format, &origr, &origg, &origb); + SDL_GetRGB(api->getpixel(last, x, y), last->format, &origr, &origg, &origb); newr = ((realrainbow_blendr * realrainbow_blenda) / 255) + ((origr * (255 - realrainbow_blenda)) / 255); newg = ((realrainbow_blendg * realrainbow_blenda) / 255) + ((origg * (255 - realrainbow_blenda)) / 255); @@ -377,4 +369,3 @@ static void realrainbow_linecb(void * ptr, int which ATTRIBUTE_UNUSED, api->putpixel(canvas, x, y, SDL_MapRGB(canvas->format, newr, newg, newb)); } -