From 88e9a3dfcfb78cbf5fdc5f1876c8c171a9e6ac71 Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Sun, 15 Oct 2017 11:48:27 -0700 Subject: [PATCH] indent noise.c --- magic/src/noise.c | 219 ++++++++++++++++++++++++++-------------------- 1 file changed, 125 insertions(+), 94 deletions(-) diff --git a/magic/src/noise.c b/magic/src/noise.c index 806b98b8c..83858503e 100644 --- a/magic/src/noise.c +++ b/magic/src/noise.c @@ -46,46 +46,45 @@ static const int noise_AMOUNT = 100.0; static const int noise_RADIUS = 16; -enum { - TOOL_NOISE, - noise_NUM_TOOLS +enum +{ + TOOL_NOISE, + noise_NUM_TOOLS }; -static Mix_Chunk * noise_snd_effect[noise_NUM_TOOLS]; +static Mix_Chunk *noise_snd_effect[noise_NUM_TOOLS]; -const char * noise_snd_filenames[noise_NUM_TOOLS] = { +const char *noise_snd_filenames[noise_NUM_TOOLS] = { "noise.ogg", }; -const char * noise_icon_filenames[noise_NUM_TOOLS] = { + +const char *noise_icon_filenames[noise_NUM_TOOLS] = { "noise.png", }; -const char * noise_names[noise_NUM_TOOLS] = { + +const char *noise_names[noise_NUM_TOOLS] = { gettext_noop("Noise"), }; -const char * noise_descs[noise_NUM_TOOLS][2] = { + +const char *noise_descs[noise_NUM_TOOLS][2] = { {gettext_noop("Click and drag the mouse to add noise to parts of your picture."), - gettext_noop("Click to add noise to your entire picture."),}, + gettext_noop("Click to add noise to your entire picture."),}, }; Uint32 noise_api_version(void); int noise_init(magic_api * api); -SDL_Surface * noise_get_icon(magic_api * api, int which); -char * noise_get_name(magic_api * api, int which); -char * noise_get_description(magic_api * api, int which, int mode); -static void do_noise_pixel(void * ptr, int which, - SDL_Surface * canvas, SDL_Surface * last, - int x, int y); -static void do_noise_full(void * ptr,SDL_Surface * canvas, SDL_Surface * last, int which); -static void do_noise_brush(void * ptr, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y); +SDL_Surface *noise_get_icon(magic_api * api, int which); +char *noise_get_name(magic_api * api, int which); +char *noise_get_description(magic_api * api, int which, int mode); +static void do_noise_pixel(void *ptr, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y); +static void do_noise_full(void *ptr, SDL_Surface * canvas, SDL_Surface * last, int which); +static void do_noise_brush(void *ptr, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y); void noise_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 noise_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 noise_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 noise_shutdown(magic_api * api); void noise_set_color(magic_api * api, Uint8 r, Uint8 g, Uint8 b); int noise_requires_colors(magic_api * api, int which); @@ -94,101 +93,127 @@ void noise_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas) int noise_modes(magic_api * api, int which); int noise_get_tool_count(magic_api * api ATTRIBUTE_UNUSED); -Uint32 noise_api_version(void) { return(TP_MAGIC_API_VERSION); } +Uint32 noise_api_version(void) +{ + return (TP_MAGIC_API_VERSION); +} //Load sounds -int noise_init(magic_api * api){ +int noise_init(magic_api * api) +{ int i; char fname[1024]; srand(time(0)); - for (i = 0; i < noise_NUM_TOOLS; i++){ - snprintf(fname, sizeof(fname), "%s/sounds/magic/%s", api->data_directory, noise_snd_filenames[i]); - noise_snd_effect[i] = Mix_LoadWAV(fname); - } - return(1); + for (i = 0; i < noise_NUM_TOOLS; i++) + { + snprintf(fname, sizeof(fname), "%s/sounds/magic/%s", api->data_directory, noise_snd_filenames[i]); + noise_snd_effect[i] = Mix_LoadWAV(fname); + } + return (1); } -int noise_get_tool_count(magic_api * api ATTRIBUTE_UNUSED){ - return(noise_NUM_TOOLS); +int noise_get_tool_count(magic_api * api ATTRIBUTE_UNUSED) +{ + return (noise_NUM_TOOLS); } // Load our icons: -SDL_Surface * noise_get_icon(magic_api * api, int which){ +SDL_Surface *noise_get_icon(magic_api * api, int which) +{ char fname[1024]; + snprintf(fname, sizeof(fname), "%simages/magic/%s", api->data_directory, noise_icon_filenames[which]); - return(IMG_Load(fname)); + return (IMG_Load(fname)); } // Return our names, localized: -char * noise_get_name(magic_api * api ATTRIBUTE_UNUSED, int which){ - return(strdup(gettext_noop(noise_names[which]))); +char *noise_get_name(magic_api * api ATTRIBUTE_UNUSED, int which) +{ + return (strdup(gettext_noop(noise_names[which]))); } // Return our descriptions, localized: -char * noise_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode){ - return(strdup(gettext_noop(noise_descs[which][mode-1]))); +char *noise_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode) +{ + return (strdup(gettext_noop(noise_descs[which][mode - 1]))); } //Do the effect for one pixel -static void do_noise_pixel(void * ptr, int which ATTRIBUTE_UNUSED, - SDL_Surface * canvas, SDL_Surface * last ATTRIBUTE_UNUSED, - int x, int y){ - magic_api * api = (magic_api *) ptr; +static void do_noise_pixel(void *ptr, int which ATTRIBUTE_UNUSED, + SDL_Surface * canvas, SDL_Surface * last ATTRIBUTE_UNUSED, int x, int y) +{ + magic_api *api = (magic_api *) ptr; Uint8 temp[3]; double temp2[3]; int k; - SDL_GetRGB(api->getpixel(canvas,x, y), canvas->format, &temp[0], &temp[1], &temp[2]); - for (k =0;k<3;k++){ - temp2[k] = clamp(0.0, (int)temp[k] - (rand()%noise_AMOUNT) + noise_AMOUNT/2.0, 255.0); - } - api->putpixel(canvas, x, y, SDL_MapRGB(canvas->format, temp2[0], temp2[1], temp2[2])); + SDL_GetRGB(api->getpixel(canvas, x, y), canvas->format, &temp[0], &temp[1], &temp[2]); + for (k = 0; k < 3; k++) + { + temp2[k] = clamp(0.0, (int)temp[k] - (rand() % noise_AMOUNT) + noise_AMOUNT / 2.0, 255.0); + } + api->putpixel(canvas, x, y, SDL_MapRGB(canvas->format, temp2[0], temp2[1], temp2[2])); } // Do the effect for the full image -static void do_noise_full(void * ptr,SDL_Surface * canvas, SDL_Surface * last, int which){ - int x,y; +static void do_noise_full(void *ptr, SDL_Surface * canvas, SDL_Surface * last, int which) +{ + int x, y; - for (y = 0; y < last->h; y++){ - for (x=0; x < last->w; x++){ - do_noise_pixel(ptr, which, canvas, last, x, y); - } - } + for (y = 0; y < last->h; y++) + { + for (x = 0; x < last->w; x++) + { + do_noise_pixel(ptr, which, canvas, last, x, y); + } + } } //do the effect for the brush -static void do_noise_brush(void * ptr, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y){ +static void do_noise_brush(void *ptr, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y) +{ int xx, yy; - magic_api * api = (magic_api *) ptr; + magic_api *api = (magic_api *) ptr; for (yy = y - noise_RADIUS; yy < y + noise_RADIUS; yy++) - { - for (xx = x - noise_RADIUS; xx < x + noise_RADIUS; xx++) { - if (api->in_circle(xx - x, yy - y, noise_RADIUS) && - !api->touched(xx, yy)) - { - do_noise_pixel(api, which, canvas, last, xx, yy); - } + for (xx = x - noise_RADIUS; xx < x + noise_RADIUS; xx++) + { + if (api->in_circle(xx - x, yy - y, noise_RADIUS) && !api->touched(xx, yy)) + { + do_noise_pixel(api, which, canvas, last, xx, yy); + } + } } - } } // Affect the canvas on drag: void noise_drag(magic_api * api, int which, SDL_Surface * canvas, - 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_noise_brush); + 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_noise_brush); api->playsound(noise_snd_effect[which], (x * 255) / canvas->w, 255); - 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 - noise_RADIUS; update_rect->y = oy - noise_RADIUS; @@ -198,41 +223,46 @@ void noise_drag(magic_api * api, int which, SDL_Surface * canvas, // Affect the canvas on click: void noise_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) +{ if (mode == MODE_PAINT) noise_drag(api, which, canvas, last, x, y, x, y, update_rect); - else{ - update_rect->x = 0; - update_rect->y = 0; - update_rect->w = canvas->w; - update_rect->h = canvas->h; - do_noise_full(api, canvas, last, which); - api->playsound(noise_snd_effect[which], 128, 255); - } + else + { + update_rect->x = 0; + update_rect->y = 0; + update_rect->w = canvas->w; + update_rect->h = canvas->h; + do_noise_full(api, canvas, last, which); + api->playsound(noise_snd_effect[which], 128, 255); + } } // Affect the canvas on release: void noise_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) { } // No setup happened: void noise_shutdown(magic_api * api ATTRIBUTE_UNUSED) { - //Clean up sounds - int i; - for(i=0; i