indent noise.c

This commit is contained in:
Bill Kendrick 2017-10-15 11:48:27 -07:00
parent 53a328e903
commit 88e9a3dfcf

View file

@ -46,7 +46,8 @@
static const int noise_AMOUNT = 100.0; static const int noise_AMOUNT = 100.0;
static const int noise_RADIUS = 16; static const int noise_RADIUS = 16;
enum { enum
{
TOOL_NOISE, TOOL_NOISE,
noise_NUM_TOOLS noise_NUM_TOOLS
}; };
@ -56,12 +57,15 @@ 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", "noise.ogg",
}; };
const char *noise_icon_filenames[noise_NUM_TOOLS] = { const char *noise_icon_filenames[noise_NUM_TOOLS] = {
"noise.png", "noise.png",
}; };
const char *noise_names[noise_NUM_TOOLS] = { const char *noise_names[noise_NUM_TOOLS] = {
gettext_noop("Noise"), 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 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."),},
@ -72,20 +76,15 @@ int noise_init(magic_api * api);
SDL_Surface *noise_get_icon(magic_api * api, int which); SDL_Surface *noise_get_icon(magic_api * api, int which);
char *noise_get_name(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); char *noise_get_description(magic_api * api, int which, int mode);
static void do_noise_pixel(void * ptr, int which, static void do_noise_pixel(void *ptr, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y);
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_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); 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, void noise_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);
void noise_click(magic_api * api, int which, int mode, void noise_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 noise_release(magic_api * api, int which, void noise_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 noise_shutdown(magic_api * api); void noise_shutdown(magic_api * api);
void noise_set_color(magic_api * api, Uint8 r, Uint8 g, Uint8 b); void noise_set_color(magic_api * api, Uint8 r, Uint8 g, Uint8 b);
int noise_requires_colors(magic_api * api, int which); int noise_requires_colors(magic_api * api, int which);
@ -94,47 +93,57 @@ void noise_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas)
int noise_modes(magic_api * api, int which); int noise_modes(magic_api * api, int which);
int noise_get_tool_count(magic_api * api ATTRIBUTE_UNUSED); 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 //Load sounds
int noise_init(magic_api * api){ int noise_init(magic_api * api)
{
int i; int i;
char fname[1024]; char fname[1024];
srand(time(0)); srand(time(0));
for (i = 0; i < noise_NUM_TOOLS; i++){ for (i = 0; i < noise_NUM_TOOLS; i++)
{
snprintf(fname, sizeof(fname), "%s/sounds/magic/%s", api->data_directory, noise_snd_filenames[i]); snprintf(fname, sizeof(fname), "%s/sounds/magic/%s", api->data_directory, noise_snd_filenames[i]);
noise_snd_effect[i] = Mix_LoadWAV(fname); noise_snd_effect[i] = Mix_LoadWAV(fname);
} }
return (1); return (1);
} }
int noise_get_tool_count(magic_api * api ATTRIBUTE_UNUSED){ int noise_get_tool_count(magic_api * api ATTRIBUTE_UNUSED)
{
return (noise_NUM_TOOLS); return (noise_NUM_TOOLS);
} }
// Load our icons: // 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]; char fname[1024];
snprintf(fname, sizeof(fname), "%simages/magic/%s", api->data_directory, noise_icon_filenames[which]); 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: // Return our names, localized:
char * noise_get_name(magic_api * api ATTRIBUTE_UNUSED, int which){ char *noise_get_name(magic_api * api ATTRIBUTE_UNUSED, int which)
{
return (strdup(gettext_noop(noise_names[which]))); return (strdup(gettext_noop(noise_names[which])));
} }
// Return our descriptions, localized: // Return our descriptions, localized:
char * noise_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode){ char *noise_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode)
{
return (strdup(gettext_noop(noise_descs[which][mode - 1]))); return (strdup(gettext_noop(noise_descs[which][mode - 1])));
} }
//Do the effect for one pixel //Do the effect for one pixel
static void do_noise_pixel(void *ptr, int which ATTRIBUTE_UNUSED, static void do_noise_pixel(void *ptr, int which ATTRIBUTE_UNUSED,
SDL_Surface * canvas, SDL_Surface * last ATTRIBUTE_UNUSED, SDL_Surface * canvas, SDL_Surface * last ATTRIBUTE_UNUSED, int x, int y)
int x, int y){ {
magic_api *api = (magic_api *) ptr; magic_api *api = (magic_api *) ptr;
Uint8 temp[3]; Uint8 temp[3];
@ -142,7 +151,8 @@ static void do_noise_pixel(void * ptr, int which ATTRIBUTE_UNUSED,
int k; int k;
SDL_GetRGB(api->getpixel(canvas, x, y), canvas->format, &temp[0], &temp[1], &temp[2]); SDL_GetRGB(api->getpixel(canvas, x, y), canvas->format, &temp[0], &temp[1], &temp[2]);
for (k =0;k<3;k++){ for (k = 0; k < 3; k++)
{
temp2[k] = clamp(0.0, (int)temp[k] - (rand() % noise_AMOUNT) + noise_AMOUNT / 2.0, 255.0); 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])); api->putpixel(canvas, x, y, SDL_MapRGB(canvas->format, temp2[0], temp2[1], temp2[2]));
@ -150,18 +160,22 @@ static void do_noise_pixel(void * ptr, int which ATTRIBUTE_UNUSED,
} }
// Do the effect for the full image // Do the effect for the full image
static void do_noise_full(void * ptr,SDL_Surface * canvas, SDL_Surface * last, int which){ static void do_noise_full(void *ptr, SDL_Surface * canvas, SDL_Surface * last, int which)
{
int x, y; int x, y;
for (y = 0; y < last->h; y++){ for (y = 0; y < last->h; y++)
for (x=0; x < last->w; x++){ {
for (x = 0; x < last->w; x++)
{
do_noise_pixel(ptr, which, canvas, last, x, y); do_noise_pixel(ptr, which, canvas, last, x, y);
} }
} }
} }
//do the effect for the brush //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; int xx, yy;
magic_api *api = (magic_api *) ptr; magic_api *api = (magic_api *) ptr;
@ -169,8 +183,7 @@ static void do_noise_brush(void * ptr, int which, SDL_Surface * canvas, SDL_Surf
{ {
for (xx = x - noise_RADIUS; xx < x + noise_RADIUS; xx++) for (xx = x - noise_RADIUS; xx < x + noise_RADIUS; xx++)
{ {
if (api->in_circle(xx - x, yy - y, noise_RADIUS) && if (api->in_circle(xx - x, yy - y, noise_RADIUS) && !api->touched(xx, yy))
!api->touched(xx, yy))
{ {
do_noise_pixel(api, which, canvas, last, xx, yy); do_noise_pixel(api, which, canvas, last, xx, yy);
} }
@ -180,15 +193,27 @@ static void do_noise_brush(void * ptr, int which, SDL_Surface * canvas, SDL_Surf
// Affect the canvas on drag: // Affect the canvas on drag:
void noise_drag(magic_api * api, int which, SDL_Surface * canvas, void noise_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){ {
api->line((void *)api, which, canvas, last, ox, oy, x, y, 1, do_noise_brush); 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); api->playsound(noise_snd_effect[which], (x * 255) / canvas->w, 255);
if (ox > x) { int tmp = ox; ox = x; x = tmp; } if (ox > x)
if (oy > y) { int tmp = oy; oy = y; y = tmp; } {
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->x = ox - noise_RADIUS;
update_rect->y = oy - noise_RADIUS; update_rect->y = oy - noise_RADIUS;
@ -198,11 +223,12 @@ void noise_drag(magic_api * api, int which, SDL_Surface * canvas,
// Affect the canvas on click: // Affect the canvas on click:
void noise_click(magic_api * api, int which, int mode, void noise_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){ {
if (mode == MODE_PAINT) if (mode == MODE_PAINT)
noise_drag(api, which, canvas, last, x, y, x, y, update_rect); noise_drag(api, which, canvas, last, x, y, x, y, update_rect);
else{ else
{
update_rect->x = 0; update_rect->x = 0;
update_rect->y = 0; update_rect->y = 0;
update_rect->w = canvas->w; update_rect->w = canvas->w;
@ -224,15 +250,19 @@ void noise_shutdown(magic_api * api ATTRIBUTE_UNUSED)
{ {
//Clean up sounds //Clean up sounds
int i; int i;
for(i=0; i<noise_NUM_TOOLS; i++){
if(noise_snd_effect[i] != NULL){ for (i = 0; i < noise_NUM_TOOLS; i++)
{
if (noise_snd_effect[i] != NULL)
{
Mix_FreeChunk(noise_snd_effect[i]); Mix_FreeChunk(noise_snd_effect[i]);
} }
} }
} }
// Record the color from Tux Paint: // Record the color from Tux Paint:
void noise_set_color(magic_api * api ATTRIBUTE_UNUSED, Uint8 r ATTRIBUTE_UNUSED, Uint8 g ATTRIBUTE_UNUSED, Uint8 b ATTRIBUTE_UNUSED) void noise_set_color(magic_api * api ATTRIBUTE_UNUSED, Uint8 r ATTRIBUTE_UNUSED, Uint8 g ATTRIBUTE_UNUSED,
Uint8 b ATTRIBUTE_UNUSED)
{ {
} }
@ -242,11 +272,13 @@ int noise_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_
return 0; return 0;
} }
void noise_switchin(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED) void noise_switchin(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED,
SDL_Surface * canvas ATTRIBUTE_UNUSED)
{ {
} }
void noise_switchout(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED) void noise_switchout(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED,
SDL_Surface * canvas ATTRIBUTE_UNUSED)
{ {
} }
@ -254,4 +286,3 @@ int noise_modes(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return (MODE_FULLSCREEN | MODE_PAINT); return (MODE_FULLSCREEN | MODE_PAINT);
} }