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

"Tint" tool can now affect the entire image.

Browse source
This commit is contained in:
William Kendrick 2008-07-09 20:17:28 +00:00
parent b74ca8c1e1
commit 94e7d90c25
2 changed files with 51 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/CHANGES.txt
View file

@ -8,7 +8,7 @@ http://www.tuxpaint.org/
$Id$
2008.July.06 (0.9.21)
2008.July.09 (0.9.21)
* New Starters:
-------------
* Silver Frame
@ -40,6 +40,8 @@ $Id$
* "Negative" tool can now affect the entire image.
* "Tint" tool can now affect the entire image.
* Build System Improvements
-------------------------
* Adhering to Debian & FreeDesktop.org standards regarding .desktop file.

70
magic/src/tint.c
View file

@ -23,7 +23,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt)
Last updated: July 8, 2008
Last updated: July 9, 2008
$Id$
*/
@ -80,13 +80,15 @@ char * tint_get_name(magic_api * api, int which)
// Return our descriptions, localized:
char * tint_get_description(magic_api * api, int which, int mode)
{
return(strdup(gettext_noop(
"Click and move the mouse around to change the picture’s color.")));
if (mode == MODE_PAINT)
return(strdup(gettext_noop("Click and move the mouse around to change the color of parts of the picture.")));
else
return(strdup(gettext_noop("Click to change the entire picture’s color.")));
}
// Do the effect:
static void do_tint(void * ptr, int which, SDL_Surface * canvas, SDL_Surface * last,
static void do_tint(void * ptr, SDL_Surface * canvas, SDL_Surface * last,
int x, int y)
{
magic_api * api = (magic_api *) ptr;
@ -94,9 +96,30 @@ static void do_tint(void * ptr, int which, SDL_Surface * canvas, SDL_Surface * l
double gd = api->sRGB_to_linear(tint_g);
double bd = api->sRGB_to_linear(tint_b);
double old;
int xx, yy;
Uint8 r, g, b;
/* Get original pixel: */
SDL_GetRGB(api->getpixel(last, x, y), last->format, &r, &g, &b);
old = api->sRGB_to_linear(r) * 0.2126 +
api->sRGB_to_linear(g) * 0.7152 +
api->sRGB_to_linear(b) * 0.0722;
api->putpixel(canvas, x, y,
SDL_MapRGB(canvas->format,
api->linear_to_sRGB(rd * old),
api->linear_to_sRGB(gd * old),
api->linear_to_sRGB(bd * old)));
}
static void do_tint_paint(void * ptr, int which, SDL_Surface * canvas, SDL_Surface * last,
int x, int y)
{
magic_api * api = (magic_api *) ptr;
int xx, yy;
for (yy = y - 16; yy < y + 16; yy++)
{
for (xx = x - 16; xx < x + 16; xx++)
@ -105,19 +128,7 @@ static void do_tint(void * ptr, int which, SDL_Surface * canvas, SDL_Surface * l
{
if (!api->touched(xx, yy))
{
/* Get original pixel: */
SDL_GetRGB(api->getpixel(last, xx, yy), last->format, &r, &g, &b);
old = api->sRGB_to_linear(r) * 0.2126 +
api->sRGB_to_linear(g) * 0.7152 +
api->sRGB_to_linear(b) * 0.0722;
api->putpixel(canvas, xx, yy,
SDL_MapRGB(canvas->format,
api->linear_to_sRGB(rd * old),
api->linear_to_sRGB(gd * old),
api->linear_to_sRGB(bd * old)));
do_tint(ptr, canvas, last, xx, yy);
}
}
}
@ -129,7 +140,7 @@ void tint_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_tint);
api->line((void *) api, which, canvas, last, ox, oy, x, y, 1, do_tint_paint);
if (ox > x) { int tmp = ox; ox = x; x = tmp; }
if (oy > y) { int tmp = oy; oy = y; y = tmp; }
@ -147,7 +158,23 @@ void tint_click(magic_api * api, int which, int mode,
SDL_Surface * canvas, SDL_Surface * last,
int x, int y, SDL_Rect * update_rect)
{
tint_drag(api, which, canvas, last, x, y, x, y, update_rect);
if (mode == MODE_PAINT)
tint_drag(api, which, canvas, last, x, y, x, y, update_rect);
else
{
int xx, yy;
for (yy = 0; yy < canvas->h; yy++)
for (xx = 0; xx < canvas->w; xx++)
do_tint(api, canvas, last, xx, yy);
update_rect->x = 0;
update_rect->y = 0;
update_rect->w = canvas->w;
update_rect->h = canvas->h;
/* FIXME: Play sfx */
}
}
@ -157,7 +184,6 @@ void tint_release(magic_api * api, int which,
{
}
// No setup happened:
void tint_shutdown(magic_api * api)
{
if (tint_snd != NULL)
@ -188,5 +214,5 @@ void tint_switchout(magic_api * api, int which, SDL_Surface * canvas)
int tint_modes(magic_api * api, int which)
{
return(MODE_PAINT); /* FIXME - Can also be turned into a full-image effect */
return(MODE_PAINT | MODE_FULLSCREEN);
}