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

indent sharpen.c

Browse source
This commit is contained in:
Bill Kendrick 2017-10-15 11:49:48 -07:00
parent ac74e0ed51
commit fee4c7ca44
1 changed files with 176 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

314
magic/src/sharpen.c
View file

@ -44,11 +44,12 @@
/* Our globals: */ /* Our globals: */
enum { enum
TOOL_TRACE, {
TOOL_SHARPEN, TOOL_TRACE,
TOOL_SILHOUETTE, TOOL_SHARPEN,
sharpen_NUM_TOOLS TOOL_SILHOUETTE,
sharpen_NUM_TOOLS
}; };
static const int THRESHOLD = 50; static const int THRESHOLD = 50;
@ -57,54 +58,52 @@ static const int sharpen_RADIUS = 16;
static const double SHARPEN = 0.5; static const double SHARPEN = 0.5;
static Mix_Chunk * sharpen_snd_effect[sharpen_NUM_TOOLS]; static Mix_Chunk *sharpen_snd_effect[sharpen_NUM_TOOLS];
const char * sharpen_snd_filenames[sharpen_NUM_TOOLS] = { const char *sharpen_snd_filenames[sharpen_NUM_TOOLS] = {
"edges.ogg", "edges.ogg",
"sharpen.ogg", "sharpen.ogg",
"silhouette.ogg" "silhouette.ogg"
}; };
const char * sharpen_icon_filenames[sharpen_NUM_TOOLS] = {
const char *sharpen_icon_filenames[sharpen_NUM_TOOLS] = {
"edges.png", "edges.png",
"sharpen.png", "sharpen.png",
"silhouette.png" "silhouette.png"
}; };
const char * sharpen_names[sharpen_NUM_TOOLS] = {
const char *sharpen_names[sharpen_NUM_TOOLS] = {
gettext_noop("Edges"), gettext_noop("Edges"),
gettext_noop("Sharpen"), gettext_noop("Sharpen"),
gettext_noop("Silhouette") gettext_noop("Silhouette")
}; };
const char * sharpen_descs[sharpen_NUM_TOOLS][2] = {
const char *sharpen_descs[sharpen_NUM_TOOLS][2] = {
{gettext_noop("Click and drag the mouse to trace edges in parts of your picture."), {gettext_noop("Click and drag the mouse to trace edges in parts of your picture."),
gettext_noop("Click to trace edges in your entire picture."),}, gettext_noop("Click to trace edges in your entire picture."),},
{gettext_noop("Click and drag the mouse to sharpen parts of your picture."), {gettext_noop("Click and drag the mouse to sharpen parts of your picture."),
gettext_noop("Click to sharpen the entire picture."),}, gettext_noop("Click to sharpen the entire picture."),},
{gettext_noop("Click and drag the mouse to create a black and white silhouette."), {gettext_noop("Click and drag the mouse to create a black and white silhouette."),
gettext_noop("Click to create a black and white silhouette of your entire picture.")}, gettext_noop("Click to create a black and white silhouette of your entire picture.")},
}; };
Uint32 sharpen_api_version(void); Uint32 sharpen_api_version(void);
int sharpen_init(magic_api * api); int sharpen_init(magic_api * api);
int sharpen_get_tool_count(magic_api * api); int sharpen_get_tool_count(magic_api * api);
SDL_Surface * sharpen_get_icon(magic_api * api, int which); SDL_Surface *sharpen_get_icon(magic_api * api, int which);
char * sharpen_get_name(magic_api * api, int which); char *sharpen_get_name(magic_api * api, int which);
char * sharpen_get_description(magic_api * api, int which, int mode); char *sharpen_get_description(magic_api * api, int which, int mode);
static int sharpen_grey(Uint8 r1,Uint8 g1,Uint8 b1); static int sharpen_grey(Uint8 r1, Uint8 g1, Uint8 b1);
static void do_sharpen_pixel(void * ptr, int which, static void do_sharpen_pixel(void *ptr, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y);
SDL_Surface * canvas, SDL_Surface * last, static void do_sharpen_full(void *ptr, SDL_Surface * canvas, SDL_Surface * last, int which);
int x, int y); static void do_sharpen_brush(void *ptr, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y);
static void do_sharpen_full(void * ptr,SDL_Surface * canvas, SDL_Surface * last, int which);
static void do_sharpen_brush(void * ptr, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y);
void sharpen_drag(magic_api * api, int which, SDL_Surface * canvas, void sharpen_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 sharpen_click(magic_api * api, int which, int mode, void sharpen_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 sharpen_release(magic_api * api, int which, void sharpen_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 sharpen_shutdown(magic_api * api); void sharpen_shutdown(magic_api * api);
void sharpen_set_color(magic_api * api, Uint8 r, Uint8 g, Uint8 b); void sharpen_set_color(magic_api * api, Uint8 r, Uint8 g, Uint8 b);
@ -113,149 +112,181 @@ void sharpen_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas
void sharpen_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas); void sharpen_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas);
int sharpen_modes(magic_api * api, int which); int sharpen_modes(magic_api * api, int which);
Uint32 sharpen_api_version(void) { return(TP_MAGIC_API_VERSION); } Uint32 sharpen_api_version(void)
{
return (TP_MAGIC_API_VERSION);
}
// No setup required: // No setup required:
int sharpen_init(magic_api * api){ int sharpen_init(magic_api * api)
{
int i; int i;
char fname[1024]; char fname[1024];
for (i = 0; i < sharpen_NUM_TOOLS; i++){ for (i = 0; i < sharpen_NUM_TOOLS; i++)
snprintf(fname, sizeof(fname), "%s/sounds/magic/%s", api->data_directory, sharpen_snd_filenames[i]); {
sharpen_snd_effect[i] = Mix_LoadWAV(fname); snprintf(fname, sizeof(fname), "%s/sounds/magic/%s", api->data_directory, sharpen_snd_filenames[i]);
} sharpen_snd_effect[i] = Mix_LoadWAV(fname);
}
return(1); return (1);
} }
// We have multiple tools: // We have multiple tools:
int sharpen_get_tool_count(magic_api * api ATTRIBUTE_UNUSED) int sharpen_get_tool_count(magic_api * api ATTRIBUTE_UNUSED)
{ {
return(sharpen_NUM_TOOLS); return (sharpen_NUM_TOOLS);
} }
// Load our icons: // Load our icons:
SDL_Surface * sharpen_get_icon(magic_api * api, int which){ SDL_Surface *sharpen_get_icon(magic_api * api, int which)
{
char fname[1024]; char fname[1024];
snprintf(fname, sizeof(fname), "%simages/magic/%s", api->data_directory, sharpen_icon_filenames[which]); snprintf(fname, sizeof(fname), "%simages/magic/%s", api->data_directory, sharpen_icon_filenames[which]);
return(IMG_Load(fname)); return (IMG_Load(fname));
} }
// Return our names, localized: // Return our names, localized:
char * sharpen_get_name(magic_api * api ATTRIBUTE_UNUSED, int which){ char *sharpen_get_name(magic_api * api ATTRIBUTE_UNUSED, int which)
return(strdup(gettext_noop(sharpen_names[which]))); {
return (strdup(gettext_noop(sharpen_names[which])));
} }
// Return our descriptions, localized: // Return our descriptions, localized:
char * sharpen_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode){ char *sharpen_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode)
return(strdup(gettext_noop(sharpen_descs[which][mode-1]))); {
return (strdup(gettext_noop(sharpen_descs[which][mode - 1])));
} }
//Calculates the grey scale value for a rgb pixel //Calculates the grey scale value for a rgb pixel
static int sharpen_grey(Uint8 r1,Uint8 g1,Uint8 b1){ static int sharpen_grey(Uint8 r1, Uint8 g1, Uint8 b1)
return 0.3*r1+.59*g1+0.11*b1; {
return 0.3 * r1 + .59 * g1 + 0.11 * b1;
} }
// Do the effect: // Do the effect:
static void do_sharpen_pixel(void * ptr, int which, static void do_sharpen_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){
magic_api * api = (magic_api *) ptr; magic_api *api = (magic_api *) ptr;
Uint8 r1, g1, b1; Uint8 r1, g1, b1;
int grey; int grey;
int i,j; int i, j;
double sobel_1=0,sobel_2=0; double sobel_1 = 0, sobel_2 = 0;
double temp; double temp;
//Sobel weighting masks //Sobel weighting masks
const int sobel_weights_1[3][3] = { {1,2,1}, const int sobel_weights_1[3][3] = { {1, 2, 1},
{0,0,0}, {0, 0, 0},
{-1,-2,-1}}; {-1, -2, -1}
const int sobel_weights_2[3][3] = { {-1,0,1}, };
{-2,0,2}, const int sobel_weights_2[3][3] = { {-1, 0, 1},
{-1,0,1}}; {-2, 0, 2},
{-1, 0, 1}
};
sobel_1=0; sobel_1 = 0;
sobel_2=0; sobel_2 = 0;
for (i=-1;i<2;i++){ for (i = -1; i < 2; i++)
for(j=-1; j<2; j++){ {
//No need to check if inside canvas, getpixel does it for us. for (j = -1; j < 2; j++)
SDL_GetRGB(api->getpixel(last, x+i, y+j), last->format, &r1, &g1, &b1); {
grey = sharpen_grey(r1,g1,b1); //No need to check if inside canvas, getpixel does it for us.
sobel_1 += grey * sobel_weights_1[i+1][j+1]; SDL_GetRGB(api->getpixel(last, x + i, y + j), last->format, &r1, &g1, &b1);
sobel_2 += grey * sobel_weights_2[i+1][j+1]; grey = sharpen_grey(r1, g1, b1);
} sobel_1 += grey * sobel_weights_1[i + 1][j + 1];
} sobel_2 += grey * sobel_weights_2[i + 1][j + 1];
}
temp = sqrt(sobel_1*sobel_1 + sobel_2*sobel_2); }
temp = (temp/1443)*255.0;
// set image to white where edge value is below THRESHOLD temp = sqrt(sobel_1 * sobel_1 + sobel_2 * sobel_2);
if (which == TOOL_TRACE){ temp = (temp / 1443) * 255.0;
if (temp<THRESHOLD){
api->putpixel(canvas, x, y, SDL_MapRGB(canvas->format, 255, 255, 255)); // set image to white where edge value is below THRESHOLD
} if (which == TOOL_TRACE)
} {
//Simply display the edge values - provides a nice black and white silhouette image if (temp < THRESHOLD)
else if (which == TOOL_SILHOUETTE){ {
api->putpixel(canvas, x, y, SDL_MapRGB(canvas->format, temp, temp, temp)); api->putpixel(canvas, x, y, SDL_MapRGB(canvas->format, 255, 255, 255));
} }
//Add the edge values to the original image, creating a more distinct jump in contrast at edges }
else if(which == TOOL_SHARPEN){ //Simply display the edge values - provides a nice black and white silhouette image
SDL_GetRGB(api->getpixel(last, x, y), last->format, &r1, &g1, &b1); else if (which == TOOL_SILHOUETTE)
api->putpixel(canvas, x, y, SDL_MapRGB(canvas->format, clamp(0.0, r1 + SHARPEN * temp, 255.0), {
clamp(0.0, g1 + SHARPEN * temp, 255.0), api->putpixel(canvas, x, y, SDL_MapRGB(canvas->format, temp, temp, temp));
clamp(0.0, b1 + SHARPEN * temp, 255.0))); }
} //Add the edge values to the original image, creating a more distinct jump in contrast at edges
else if (which == TOOL_SHARPEN)
{
SDL_GetRGB(api->getpixel(last, x, y), last->format, &r1, &g1, &b1);
api->putpixel(canvas, x, y, SDL_MapRGB(canvas->format, clamp(0.0, r1 + SHARPEN * temp, 255.0),
clamp(0.0, g1 + SHARPEN * temp, 255.0),
clamp(0.0, b1 + SHARPEN * temp, 255.0)));
}
} }
// Do the effect for the full image // Do the effect for the full image
static void do_sharpen_full(void * ptr,SDL_Surface * canvas, SDL_Surface * last, int which){ static void do_sharpen_full(void *ptr, SDL_Surface * canvas, SDL_Surface * last, int which)
{
// magic_api * api = (magic_api *) ptr; // magic_api * api = (magic_api *) ptr;
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++){ {
do_sharpen_pixel(ptr, which, canvas, last, x, y); for (x = 0; x < last->w; x++)
} {
} do_sharpen_pixel(ptr, which, canvas, last, x, y);
}
}
} }
//do the effect for the brush //do the effect for the brush
static void do_sharpen_brush(void * ptr, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y){ static void do_sharpen_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;
for (yy = y - sharpen_RADIUS; yy < y + sharpen_RADIUS; yy++) for (yy = y - sharpen_RADIUS; yy < y + sharpen_RADIUS; yy++)
{
for (xx = x - sharpen_RADIUS; xx < x + sharpen_RADIUS; xx++)
{ {
if (api->in_circle(xx - x, yy - y, sharpen_RADIUS) && for (xx = x - sharpen_RADIUS; xx < x + sharpen_RADIUS; xx++)
!api->touched(xx, yy)) {
{ if (api->in_circle(xx - x, yy - y, sharpen_RADIUS) && !api->touched(xx, yy))
do_sharpen_pixel(api, which, canvas, last, xx, yy); {
} do_sharpen_pixel(api, which, canvas, last, xx, yy);
}
}
} }
}
} }
// Affect the canvas on drag: // Affect the canvas on drag:
void sharpen_drag(magic_api * api, int which, SDL_Surface * canvas, void sharpen_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_sharpen_brush); api->line((void *)api, which, canvas, last, ox, oy, x, y, 1, do_sharpen_brush);
api->playsound(sharpen_snd_effect[which], (x * 255) / canvas->w, 255); api->playsound(sharpen_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 - sharpen_RADIUS; update_rect->x = ox - sharpen_RADIUS;
update_rect->y = oy - sharpen_RADIUS; update_rect->y = oy - sharpen_RADIUS;
@ -265,41 +296,46 @@ void sharpen_drag(magic_api * api, int which, SDL_Surface * canvas,
// Affect the canvas on click: // Affect the canvas on click:
void sharpen_click(magic_api * api, int which, int mode, void sharpen_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)
sharpen_drag(api, which, canvas, last, x, y, x, y, update_rect); sharpen_drag(api, which, canvas, last, x, y, x, y, update_rect);
else{ else
update_rect->x = 0; {
update_rect->y = 0; update_rect->x = 0;
update_rect->w = canvas->w; update_rect->y = 0;
update_rect->h = canvas->h; update_rect->w = canvas->w;
do_sharpen_full(api, canvas, last, which); update_rect->h = canvas->h;
api->playsound(sharpen_snd_effect[which], 128, 255); do_sharpen_full(api, canvas, last, which);
} api->playsound(sharpen_snd_effect[which], 128, 255);
}
} }
// Affect the canvas on release: // Affect the canvas on release:
void sharpen_release(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, void sharpen_release(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED,
SDL_Surface * canvas ATTRIBUTE_UNUSED, SDL_Surface * last 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) int x ATTRIBUTE_UNUSED, int y ATTRIBUTE_UNUSED, SDL_Rect * update_rect ATTRIBUTE_UNUSED)
{ {
} }
// No setup happened: // No setup happened:
void sharpen_shutdown(magic_api * api ATTRIBUTE_UNUSED) void sharpen_shutdown(magic_api * api ATTRIBUTE_UNUSED)
{ {
//Clean up sounds //Clean up sounds
int i; int i;
for(i=0; i<sharpen_NUM_TOOLS; i++){
if(sharpen_snd_effect[i] != NULL){ for (i = 0; i < sharpen_NUM_TOOLS; i++)
Mix_FreeChunk(sharpen_snd_effect[i]); {
} if (sharpen_snd_effect[i] != NULL)
} {
Mix_FreeChunk(sharpen_snd_effect[i]);
}
}
} }
// Record the color from Tux Paint: // Record the color from Tux Paint:
void sharpen_set_color(magic_api * api ATTRIBUTE_UNUSED, Uint8 r ATTRIBUTE_UNUSED, Uint8 g ATTRIBUTE_UNUSED, Uint8 b ATTRIBUTE_UNUSED) void sharpen_set_color(magic_api * api ATTRIBUTE_UNUSED, Uint8 r ATTRIBUTE_UNUSED, Uint8 g ATTRIBUTE_UNUSED,
Uint8 b ATTRIBUTE_UNUSED)
{ {
} }
@ -309,15 +345,17 @@ int sharpen_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUT
return 0; return 0;
} }
void sharpen_switchin(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED) void sharpen_switchin(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED,
SDL_Surface * canvas ATTRIBUTE_UNUSED)
{ {
} }
void sharpen_switchout(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED) void sharpen_switchout(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED,
SDL_Surface * canvas ATTRIBUTE_UNUSED)
{ {
} }
int sharpen_modes(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) int sharpen_modes(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
{ {
return(MODE_FULLSCREEN|MODE_PAINT); return (MODE_FULLSCREEN | MODE_PAINT);
} }