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

Merge branch 'master' into sdl2.0

Browse source
This commit is contained in:
Pere Pujal i Carabantes 2021-11-09 23:23:28 +01:00
commit 75ca9dd66e
8 changed files with 51 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docs/CHANGES.txt
View file

@ -8,7 +8,7 @@ http://www.tuxpaint.org/
$Id$ $Id$
2021.November.4 (0.9.27) 2021.November.8 (0.9.27)
* New Magic Tools: * New Magic Tools:
---------------- ----------------
* "Lightning" - Draws a bolt of lightning striking between * "Lightning" - Draws a bolt of lightning striking between
@ -44,6 +44,10 @@ $Id$
* "Blocks", "Cartoon", "Chalk", "Emboss", and "Halftone" can all now * "Blocks", "Cartoon", "Chalk", "Emboss", and "Halftone" can all now
affect the entire image at once. affect the entire image at once.
* More tools update progress bar while doing lots of work
(mostly full-screen mode). More tools play their sound effects
when applying effects in full-screen mode.
* Improvements to "Paint" and "Lines" tools: * Improvements to "Paint" and "Lines" tools:
------------------------------------------ ------------------------------------------
* Rotational brushes now supported. Unlike "directional" * Rotational brushes now supported. Unlike "directional"

10
magic/src/blocks_chalk_drip.c
View file

@ -1,6 +1,6 @@
/* /*
blocks_chalk_drip.c blocks_chalk_drip.c
//
Blocks, Chalk and Drip Magic Tools Plugin Blocks, Chalk and Drip Magic Tools Plugin
Tux Paint - A simple drawing program for children. Tux Paint - A simple drawing program for children.
@ -23,7 +23,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: October 27, 2021 Last updated: November 8, 2021
$Id$ $Id$
*/ */
@ -325,6 +325,10 @@ void blocks_chalk_drip_click(magic_api * api, int which, int mode,
blocks_chalk_drip_drag(api, which, canvas, last, x, y, x, y, update_rect); blocks_chalk_drip_drag(api, which, canvas, last, x, y, x, y, update_rect);
} else /* MODE_FULLSCREEN */ { } else /* MODE_FULLSCREEN */ {
for (y = 0; y < canvas->h; y += EFFECT_REZ) { for (y = 0; y < canvas->h; y += EFFECT_REZ) {
if (y % 10 == 0) {
api->update_progress_bar();
}
for (x = 0; x < canvas->w; x += EFFECT_REZ) { for (x = 0; x < canvas->w; x += EFFECT_REZ) {
blocks_chalk_drip_linecb(api, which, canvas, last, x, y); blocks_chalk_drip_linecb(api, which, canvas, last, x, y);
} }
@ -333,6 +337,8 @@ void blocks_chalk_drip_click(magic_api * api, int which, int mode,
update_rect->y = 0; update_rect->y = 0;
update_rect->w = canvas->w; update_rect->w = canvas->w;
update_rect->h = canvas->h; update_rect->h = canvas->h;
api->playsound(snd_effect[which], (x * 255) / canvas->w, 255);
} }
} }

12
magic/src/blur.c
View file

@ -25,7 +25,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: September 20, 2021 Last updated: November 8, 2021
$Id$ $Id$
*/ */
@ -185,16 +185,18 @@ static void do_blur_pixel(void *ptr, int which ATTRIBUTE_UNUSED, SDL_Surface * c
// Do the effect for the full image // Do the effect for the full image
static void do_blur_full(void *ptr, SDL_Surface * canvas, SDL_Surface * last, int which) static void do_blur_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++)
{ {
if (y % 10 == 0) {
api->update_progress_bar();
}
for (x = 0; x < last->w; x++) for (x = 0; x < last->w; x++)
{ {
do_blur_pixel(ptr, which, canvas, last, x, y); do_blur_pixel(api, which, canvas, last, x, y);
} }
} }
} }

12
magic/src/cartoon.c
View file

@ -23,7 +23,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: November 4, 2021 Last updated: November 8, 2021
$Id$ $Id$
*/ */
@ -227,6 +227,10 @@ void cartoon_click(magic_api * api, int which, int mode,
{ {
for (y = 0; y < canvas->h; y++) for (y = 0; y < canvas->h; y++)
{ {
if (y % 10 == 0) {
api->update_progress_bar();
}
for (x = 0; x < canvas->w; x++) for (x = 0; x < canvas->w; x++)
{ {
cartoon_apply_colors(api, last, x, y); cartoon_apply_colors(api, last, x, y);
@ -234,6 +238,10 @@ void cartoon_click(magic_api * api, int which, int mode,
} }
for (y = 0; y < canvas->h; y++) for (y = 0; y < canvas->h; y++)
{ {
if (y % 10 == 0) {
api->update_progress_bar();
}
for (x = 0; x < canvas->w; x++) for (x = 0; x < canvas->w; x++)
{ {
cartoon_apply_outline(api, x, y); cartoon_apply_outline(api, x, y);
@ -246,6 +254,8 @@ void cartoon_click(magic_api * api, int which, int mode,
} }
else else
{ {
api->playsound(cartoon_snd, 128, 255);
SDL_BlitSurface(result_surf, NULL, canvas, NULL); SDL_BlitSurface(result_surf, NULL, canvas, NULL);
update_rect->x = 0; update_rect->x = 0;
update_rect->y = 0; update_rect->y = 0;

6
magic/src/emboss.c
View file

@ -23,7 +23,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: September 20, 2021 Last updated: November 8, 2021
$Id$ $Id$
*/ */
@ -204,6 +204,10 @@ void emboss_click(magic_api * api, int which, int mode,
emboss_drag(api, which, canvas, last, x, y, x, y, update_rect); emboss_drag(api, which, canvas, last, x, y, x, y, update_rect);
} else { } else {
for (y = 0; y < canvas->h; y++) { for (y = 0; y < canvas->h; y++) {
if (y % 10 == 0) {
api->update_progress_bar();
}
for (x = 0; x < canvas->w; x++) { for (x = 0; x < canvas->w; x++) {
emboss_pixel(api, last, x, y, canvas); emboss_pixel(api, last, x, y, canvas);
} }

4
magic/src/glasstile.c
View file

@ -23,7 +23,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: September 21, 2021 Last updated: November 8, 2021
$Id$ $Id$
*/ */
@ -272,7 +272,7 @@ void glasstile_click(magic_api * api, int which, int mode,
update_rect->w = canvas->w; update_rect->w = canvas->w;
update_rect->h = canvas->h; update_rect->h = canvas->h;
/* FIXME: Play sfx */ api->playsound(glasstile_snd, 128, 255);
} }
} }

14
magic/src/sharpen.c
View file

@ -6,7 +6,7 @@
Credits: Andrew Corcoran <akanewbie@gmail.com> Credits: Andrew Corcoran <akanewbie@gmail.com>
Copyright (c) 2002-2009 by Bill Kendrick and others; see AUTHORS.txt Copyright (c) 2002-2021 by Bill Kendrick and others; see AUTHORS.txt
bill@newbreedsoftware.com bill@newbreedsoftware.com
http://www.tuxpaint.org/ http://www.tuxpaint.org/
@ -25,7 +25,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: May 6, 2009 Last updated: May 6, 2021
$Id$ $Id$
*/ */
@ -177,7 +177,6 @@ static int sharpen_grey(Uint8 r1, Uint8 g1, Uint8 b1)
// Do the effect: // Do the effect:
static void do_sharpen_pixel(void *ptr, int which, SDL_Surface * canvas, SDL_Surface * last, int x, int y) static void do_sharpen_pixel(void *ptr, int which, 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;
@ -239,16 +238,19 @@ static void do_sharpen_pixel(void *ptr, int which, SDL_Surface * canvas, SDL_Sur
// 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++)
{ {
if (y % 10 == 0) {
api->update_progress_bar();
}
for (x = 0; x < last->w; x++) for (x = 0; x < last->w; x++)
{ {
do_sharpen_pixel(ptr, which, canvas, last, x, y); do_sharpen_pixel(api, which, canvas, last, x, y);
} }
} }
} }

14
src/po/ja.po
View file

@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: tuxpaint 0.9.23\n" "Project-Id-Version: tuxpaint 0.9.23\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-11-07 20:32-0800\n" "POT-Creation-Date: 2021-11-07 20:32-0800\n"
"PO-Revision-Date: 2021-10-30 18:22+0900\n" "PO-Revision-Date: 2021-11-09 23:01+0900\n"
"Last-Translator: Shin-ichi TOYAMA <shin1@wmail.plala.or.jp>\n" "Last-Translator: Shin-ichi TOYAMA <shin1@wmail.plala.or.jp>\n"
"Language-Team: japanese <shin1@wmail.plala.or.jp>\n" "Language-Team: japanese <shin1@wmail.plala.or.jp>\n"
"Language: ja\n" "Language: ja\n"
@ -1207,10 +1207,8 @@ msgid "Lightning"
msgstr "いなずま" msgstr "いなずま"
#: ../../magic/src/lightning.c:88 #: ../../magic/src/lightning.c:88
#, fuzzy
#| msgid "Click, drag, and release to a lightning bolt between two points."
msgid "Click, drag, and release to draw a lightning bolt between two points." msgid "Click, drag, and release to draw a lightning bolt between two points."
msgstr "クリックしたあとドラッグして いなずまを かこう。" msgstr "クリックしたまま マウスをうごかして いなずまを えがこう。"
#: ../../magic/src/metalpaint.c:99 #: ../../magic/src/metalpaint.c:99
msgid "Metal Paint" msgid "Metal Paint"
@ -1435,14 +1433,12 @@ msgstr ""
#: ../../magic/src/reflection.c:110 #: ../../magic/src/reflection.c:110
msgid "Reflection" msgid "Reflection"
msgstr "" msgstr "はんしゃ"
#: ../../magic/src/reflection.c:120 #: ../../magic/src/reflection.c:120
#, fuzzy
#| msgid ""
#| "Click and drag the mouse to add a mosaic effect to parts of your picture."
msgid "Click and drag the mouse around to add a reflection to your picture." msgid "Click and drag the mouse around to add a reflection to your picture."
msgstr "クリックしたまま マウスをうごかして モザイクえのようにしよう。" msgstr ""
"クリックしたまま マウスをうごかして かがみにうつったような えに しよう。"
#: ../../magic/src/ripples.c:103 #: ../../magic/src/ripples.c:103
msgid "Ripples" msgid "Ripples"