From 8d67915b3ecddcd9e990450016dd9cf1470e0624 Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Sat, 4 Sep 2021 14:28:01 -0700 Subject: [PATCH] "Panels" magic tool; convert image to 2x2 repeat Useful for making 4-panel comics; or repeat multiple times to create a compound-eye effect. Closes https://sourceforge.net/p/tuxpaint/feature-requests/204/ --- docs/CHANGES.txt | 9 +++- magic/docs/en/README.txt | 2 +- magic/docs/en/html/README.html | 2 +- magic/icons/panels.png | Bin 0 -> 7787 bytes magic/magic-docs/en/html/index.html | 1 + magic/magic-docs/en/html/panels.html | 9 ++++ magic/magic-docs/en/index.txt | 1 + magic/magic-docs/en/panels.txt | 6 +++ magic/magic-docs/src/magic-docs.php | 4 ++ magic/src/perspective.c | 71 +++++++++++++++++++++++---- 10 files changed, 93 insertions(+), 12 deletions(-) create mode 100644 magic/icons/panels.png create mode 100644 magic/magic-docs/en/html/panels.html create mode 100644 magic/magic-docs/en/panels.txt diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index 575e4b5fe..a595b146f 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -8,7 +8,14 @@ http://www.tuxpaint.org/ $Id$ -2021.September.2 (0.9.27) +2021.September.4 (0.9.27) + * New Magic Tools: + ---------------- + * "Panels" - Convert your picture to 4-panel-comic-style + 2x2 image, repeating the original. (Repeat for "compound eye" + style effects!) + (Closes https://sourceforge.net/p/tuxpaint/feature-requests/204/) + * Documentation updates --------------------- * Ensured Tux Paint's built-in help ("tuxpaint --help"), diff --git a/magic/docs/en/README.txt b/magic/docs/en/README.txt index f5173ae38..672494c2d 100644 --- a/magic/docs/en/README.txt +++ b/magic/docs/en/README.txt @@ -1,6 +1,6 @@ Creating Tux Paint Magic Tool Plugins - Copyright 2007-2018 by various contributors; see AUTHORS.txt + Copyright 2007-2021 by various contributors; see AUTHORS.txt http://www.tuxpaint.org/ July 5, 2007 - February 20, 2021 diff --git a/magic/docs/en/html/README.html b/magic/docs/en/html/README.html index e6fcd52ef..23b246a99 100644 --- a/magic/docs/en/html/README.html +++ b/magic/docs/en/html/README.html @@ -9,7 +9,7 @@ alink="#FF00FF">

Creating Tux Paint Magic Tool Plugins

-

Copyright 2007-2018 by various contributors; see AUTHORS.txt
+

Copyright 2007-2021 by various contributors; see AUTHORS.txt
http://www.tuxpaint.org/

July 5, 2007 - February 20, 2021

diff --git a/magic/icons/panels.png b/magic/icons/panels.png new file mode 100644 index 0000000000000000000000000000000000000000..7da5adb71af5414d72d10ddb149c3ba9a2a4d3a0 GIT binary patch literal 7787 zcmeHMc{r5q_g5slL?L95EoRJMEMwn|Eg?e6tc-0mGYqn1EwW@w6w2P4B}+nISR4f=Di_0W41R3B?z+-VP7y!xJ9Rt94;jmOxULys`IL}Ei zOUV8t2a)EwXiUR;O=UfAfU0T9sELxHX!tcry?bIuk8#|L=-mH7ZVT87Z`N56n7)iu z-dbtmwB5cN^DXx)nYi_%Heg{<>6`D>&g$A{4+*^Qw;iGf*I#`5T>Hv9&zFIfaoXRn zC#_CwuQqrlwD7p%``GD*iqq!@HQ%INyYC$6lj6}B_b!uuvE)P5K8d<617DCne*49p ziQPr^ah|{#1?OCuuOHsS0^DBB7O`1vn{K?E(VX1fOThe$UMh#GtRYK!%ai95q@f#0vcN1s(@va)GFhAHKL8O2wR+c^S{ zjd6Kk)%==j^F@x0nog~yKBa2Rx8)68{4hGd81rdP9qc0Sz?842l;l`{r8xWglw5Z- zBXx_+pwXGZqZPLuj?1BV>F&ydxZ*^uA4Jy2aQmKT#Kbkr0l)%7^`HVW=%`8gj>}g# z_L_6B%7q4NDmML08rdw)%ig!6w&1GlTF{CQT6B=CyIS)uv?0%Ci(u7uw z%DQCD8f?LxI*sdkR;(VkM+#ibSgj#arc1da|Bk7x+x98TE4b-PmNl8!sgU)e!NH3% z@_h@s22w`kz6xme=tSt zy;usqpJeB;ZkgJ!6lALD>=qVRuMpsW*EEnXfMZQ}D0tGt@r<3R7xbwpbEL}1(0Qk- z;*#Bo+}ff!Yb9oQNT|vy!k1Yj&ylS3u&YtuZmix?#9P~l+6Hl-^q*5G8=?X|6a^fK zuOJ4ZHx!W5v{g|Ffa4CXJ6kD9nwKIT_zkB?kBtfhzLCd+|qEY%_+RYgS3jyX^-x$NrAANLgy3&2A88&;^zuSzR&KQw60 zve*wmEDPK8f?)TKsI+z}YcSJ!(~@OhL=3`=f#0mPgnB?Y1-()1n#A{FI=-TOx{~~* z(ML{n92QRJuZO}1`q=oYuUp)Y*#lJC>@Xd-X0S;-7Jhc#JEaE=c&mliOB27qogx%} zo7*%Che)7im&|7$yU%qJFTOr_(N#EDgY#RcZIVcD*jNea0ke--#cLg3^Prs76x6Nb zh3U~ckK(I1m80jyT7HC-Fh223Xj~j%qDup}Og7dIW*4ZUFv>5*h2xuco@6rt!@G21 zxmq|SKg8TEr}t6PRlX09=ehkxPvRa6$I|5$mqtvG^2n>M3zq8QPAy##uE9R5iEOK? zEc>*<`BFB^Y)l;9AKZKI`H#fU2MwS-&ehQj6NI#0FQ= zDvu5bjOoB~{S(eW?Uv~hJ!sDMjojBOJ2D`FSkv#BI0pmB>Mwdvt~%C>(jhb*XK6Bz{$n zd!%veO0YC&in*cSVP|38rH-t7_6B^Iw{M==EIY7$)s~xt1-JKBg_!U77V7mmKUAO< z>abu~QY}^zUWE-sgtM6Nna}LWMHpU3*E9{3YGxVPt=#XM?HV!@h*<0`k<*)SH!oOW z=byB`n{~N6W25v$WHl{Na9mN7B%zl*FehvOqYuGQ^s-;_QcA7Sym@Z@_0xlAHAVZA z3nMScglv>_)?Ra)95%!ipE~-ncxc>UQK4hCrcb1O;!;WE@t_K>?Xp!i69Kbrniqk_ z*O(v+af=tPI6qd8wQn-@{k|5~*g^zMqz^yt@#=Buo;&@x`a_hF)U%iQ>fgE`qqzH3bN6%VdFCs{Xpf*(;l=kIJuT3MWTmUQ z(HqpgZcOu7+Ae{_NigdP$k|?hTZmty@+sm$&>l4KzOFQkpH|qHkh1d+il5jV~T7~<;znpd*rlK z=kbV@Ij?$7y`TFfikEgr&DO-{ZP3z%RYC<{RHY z1KIQ+a?C14DxI_9#NNDcnJq1O4wTW<$w(^(+ECGVA#Z2mp?vveMu``=OU5PI&bugn z_V$cT#$g7T46@9Bd+Zo=>eQtD32BG6oIOa;B9&5*nY9Pxi*`Xr4fQ&I78$(c6`Omr z@>WOk=t6s6zg8eO%nr9y7-r2a?Yz>kp5rQ{#qiGf)aNPt8#6h&Jc``D>_n@ZiHW4V zam?nj$r9H88+}m3NVt@UgRWB2$D*`&aEbY@Q}R%Kg&*`QYYXXQGv9o2`pqzd&kE*K z4UPg8fnVcsIyX+%KZwf8bDzm*%4u2&euQtV*J$PvtZKBr9n5q_z|*MSD#5n<%!xxN7h>LLm#v7M`?|3+3mRe z$y^cKPi&)2YlwEaw-lb!#8*SBo=i`hiJXMWN;tk$l27EV4*YfI9vW~PnP7!;q-hLlu zF*1IqWHAcORqxr2#@a-sY;{6dE%{n7gTa?(3|@Gw1u(@{mDei|_Ertle#zuvJ+m0m zW?#&7i$>0srW2ink0M3JW?4DC)-ih3i1rLYe>py2mC^H{=XP_3;4#)>g_p;HBV~PU zNIq!gr7wK=%ZUvvBi}wS=cVy6GTrrDJhLs%8zX>kxX4rY;vJejrxcRI>dj->G zaF|tYm`DQ8si)Q9(~oS_OE`F!pS~G589hEbVI$qcxl_KQ~{qrqRTcn%Wpnf<115859PSkI`#PI)$)cE=>q99 zC>ahmt!MoSy^^IBGIovyj?#Yp9M4haPt|z53S!p8X&G2Ky2>}(^ANr)sUv5?J)Q!U zW$JlPVwE>Fb+#0E_gP-Ia3%1CkUOpxZg53kTko-R2~;R2X$2>gctUlu8BewBiml(2 zUC9(blP2Drd7R!z-K62gQ>U}y*+V12=F=JYX~7H28G2puz%GW=kCBnN)oT_Od>RkY*0AJ3J2s)f^;x#q_ z+>vQp!Knrd5>Lcb{1ZpN^B?WzGIve=tDnZKYHhC+szzAz8|J3B#*o)9`irTJ_v>vx z-u1HLpB7!6oa`39#xAMKxinSavuU?tQY)t6e}24eP^T}ZNol+4_D*rwdA0s1H*hOu zDG8iMQ+Y~%`xrez;_fQr$tl%#9{SZ$!609apk1mapoZHqGk=YsF@~(&AezdURig0s zwM^yqm~+#0jCYgv#MDj$q<&l+X9vJTUedsM)gtba>EoR8`f4edLK;p&8^&zCZvhjW z0_puHz3&N3?59uI-S!1)`D_bw6IwShty)%0^_ao{+vJoxn{e2vjb`2@G#A3aoO^iDpTOo2hme?!zM!3Uv2^xWsLvcH_9hvoE~< zR{B*kpm{kaV>*g=8%c=$DNf&gpgG;j+W+9ej?i`dL^@$Ad+(LOzNB7zw%*?5=mf)< z-8kNDgNm1Jv4q)JwR=L-y+UL02yS*(whgZz7tpBWO}{6PhI?lk`rF=1kgu9*DVaL1nNiK$7$e-a zdF)M$-x_O4R&|eX9ni3y$8HsVuTflQk2M`45y1a0Rh)|I$T^&rmML6I>-UC}(q=wP zz1wBbpw1Cm*ZhgUYSlpibhHXsQ7j>UNq~a`Szu2}G_jEsft(X>l3zAnLsXrhnRvx% z>b{u#<#p(=g1aJr(v7#t-0ovT=X8jyab=w~S4AtB3dcg_?>UwPHkdd@Z>`$Z&!W7CLzGT>k0>wf`xp5=y!0Td%lh zFBk>D6+=P*yj)$}h%he|!9!da<@sP)N)T|ULUL9SyliX=(83ci09lYM2n^Km!g)#y zsxknS31}?LOk4LC1ZAco=tv^D!=$9hWHN{>1Huy=q#%llic(-{DQRgSMFU9mb|WFY zfNn&g1Bjm(+882=fO99|@NR$uOav0|K~fPEq{sok$LH#9Z2Skj8}Szl6h5T95bjbC z5Ln99RqC%6M3Rmt1>{#i|IvbILHV6S$_zuqdk|0<9Z!rKN$9T-Xw)C}?j8h}!*tLn zDU1uom7+?dc!m7Ur5@ba^bd;z3LJ2*?uS+svj3(@!eRd;>u<3gNDkBaYakT!KXCu1 z{d?|*$`mbQW0*D`<#7-mTw6u(z&{L)N8!-0!$&y;6pBWnAwWf0${?!w6U{uncEJjfVs3?P_AS*%@ArM&% z0woVVghHcWx_E*sg0h`BSA+vb%H7T3P;fvvOv4neA}9^|sd~6#>VhC)DF!NnMmRSQ zuRm2SaIP4065@bOh@1>qUO`a~q6m?emzVyT_Mx>UhCrlL;sGWE4EiNG*cKQi849t8 zgF2-E{GKIDi-19p@B|Ay-bF?500MAed05^6<)53Pk0Vkvybmh=SIwJauK%35@Y6Y*FQ89~5kI8ZXBWJ4*S!)yRzhg6FHJr=Sf=71-# zGz17%1cGHPAhIy991Kc%mWP4Cf>OT{mO6N=f6rK1>i=+}e5ml3V}N4!bB%JmP);kU zKaQ(koE^~kU;O;qi~phr3iQ8D{t>_b()BN0|A>Kqr2KDn{Y%$BV&ESs|65)EZ*(#I z+3;Z8DBps}ly;`?X~@C9nMaX^dfHU`w_-Z$C^LF@eQP2W6(ifhbtC|NEtax)oCG)4 zIX+EKbBb1JJ$@&e(u+dj+8P%6EsK2`PUaUmXg@4fkBwBDYH=W+_ri}y9P5d#hycBI ztzhB&DDtqJ+D=_GBisJb$!BumjyrCmk4?X1lh038*N3*WR92G}0?^vM-1n#RO=F3D zl^h?RJT?y4jec{Ee9UGxF6pfIm(VAEda6yhk9!75S4M~*p#D44uRGTU!V*E=Zi6xf z3xUNZb;~!-+o49o@p0K;!a{!cvtFnwY+1KlcExVKgfbH*MpY&g`FT_BURY?dQqiKG(be5+gXE5E=ieIWPOj7S-0ha>u5!P2Ew{96+A#Hw mhi}28GvBrOtsS+=d4}iRPP@@$2^I>cRB#;=?Ltlap#K49Kq!6y literal 0 HcmV?d00001 diff --git a/magic/magic-docs/en/html/index.html b/magic/magic-docs/en/html/index.html index ed77bc230..b50bcda63 100644 --- a/magic/magic-docs/en/html/index.html +++ b/magic/magic-docs/en/html/index.html @@ -39,6 +39,7 @@
  • Square Mosaic
  • Negative
  • Noise
    • +
  • Panels
  • Pattern
  • Perspective
  • Picasso
    • diff --git a/magic/magic-docs/en/html/panels.html b/magic/magic-docs/en/html/panels.html new file mode 100644 index 000000000..b7db99cf6 --- /dev/null +++ b/magic/magic-docs/en/html/panels.html @@ -0,0 +1,9 @@ + +Tux Paint "Magic" Tool: Panels + + + +

    Tux Paint "Magic" Tool: Panels

    +

    By Bill Kendrick <bill@newbreedsoftware.com>

    +

    Shrink the image and repeat it four times in a 2-by-2 grid. Useful for creating 4-panel comics. Can also be used to create a compound-eye effect.

    + \ No newline at end of file diff --git a/magic/magic-docs/en/index.txt b/magic/magic-docs/en/index.txt index 667124e6b..7d4cdcf23 100644 --- a/magic/magic-docs/en/index.txt +++ b/magic/magic-docs/en/index.txt @@ -35,6 +35,7 @@ * Square Mosaic * Negative * Noise + * Panels * Pattern * Perspective * Picasso diff --git a/magic/magic-docs/en/panels.txt b/magic/magic-docs/en/panels.txt new file mode 100644 index 000000000..a5201368a --- /dev/null +++ b/magic/magic-docs/en/panels.txt @@ -0,0 +1,6 @@ + Tux Paint "Magic" Tool: Panels + + By Bill Kendrick + + Shrink the image and repeat it four times in a 2-by-2 grid. Useful for + creating 4-panel comics. Can also be used to create a compound-eye effect. diff --git a/magic/magic-docs/src/magic-docs.php b/magic/magic-docs/src/magic-docs.php index 2904c7b98..1b852e004 100644 --- a/magic/magic-docs/src/magic-docs.php +++ b/magic/magic-docs/src/magic-docs.php @@ -221,6 +221,10 @@ $tools = array( 'desc'=>'Add random noise and static to your picture.', 'author'=>$AUTHOR_ANDREWC), + array('name'=>'Panels', + 'desc'=>'Shrink the image and repeat it four times in a 2-by-2 grid. Useful for creating 4-panel comics. Can also be used to create a compound-eye effect.', + 'author'=>$AUTHOR_KENDRICK), + array('name'=>'Pattern', 'desc'=>'Draws a tiled pattern around the picture.', 'author'=>$AUTHOR_PERE, diff --git a/magic/src/perspective.c b/magic/src/perspective.c index b8d087d4a..692805769 100644 --- a/magic/src/perspective.c +++ b/magic/src/perspective.c @@ -8,7 +8,7 @@ Credits: Andrew Corcoran - Copyright (c) 2002-2019 by Bill Kendrick and others; see AUTHORS.txt + Copyright (c) 2002-2021 by Bill Kendrick and others; see AUTHORS.txt bill@newbreedsoftware.com http://www.tuxpaint.org/ @@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA (See COPYING.txt) - Last updated: August 29, 2019 + Last updated: September 4, 2021 $Id$ */ @@ -114,6 +114,7 @@ float top_advc_y, right_advc_y, bottom_advc_y, left_advc_y; enum { TOOL_PERSPECTIVE, + TOOL_PANELS, TOOL_ZOOM, perspective_NUM_TOOLS }; @@ -134,28 +135,29 @@ static Mix_Chunk *perspective_snd_effect[perspective_NUM_TOOLS + 1]; const char *perspective_snd_filenames[perspective_NUM_TOOLS + 1] = { "perspective.ogg", + "zoom_down.ogg", /* TODO: Could use a different sound */ "zoom_up.ogg", "zoom_down.ogg", }; const char *perspective_icon_filenames[perspective_NUM_TOOLS] = { "perspective.png", + "panels.png", "zoom.png", }; const char *perspective_names[perspective_NUM_TOOLS] = { gettext_noop("Perspective"), + gettext_noop("Panels"), gettext_noop("Zoom"), - }; const char *perspective_descs[perspective_NUM_TOOLS] = { gettext_noop("Click on the corners and drag where you want to stretch the picture."), + gettext_noop("Click to turn your picture into 2-by-2 panels."), gettext_noop("Click and drag up to zoom in or drag down to zoom out the picture."), - - }; Uint32 perspective_api_version(void) @@ -358,8 +360,56 @@ void perspective_click(magic_api * api, int which, int mode ATTRIBUTE_UNUSED, old_h = new_h; } break; + case TOOL_PANELS: + { + SDL_Surface *scaled_surf; + + scaled_surf = api->scale(canvas, canvas->w / 2, canvas->h / 2, 0); + + /* Top left */ + update_rect->x = 0; + update_rect->y = 0; + update_rect->w = scaled_surf->w; + update_rect->h = scaled_surf->h; + SDL_BlitSurface(scaled_surf, NULL, canvas, update_rect); + + /* Top right */ + update_rect->x = scaled_surf->w; + update_rect->y = 0; + update_rect->w = scaled_surf->w; + update_rect->h = scaled_surf->h; + SDL_BlitSurface(scaled_surf, NULL, canvas, update_rect); + + /* Bottom left */ + update_rect->x = 0; + update_rect->y = scaled_surf->h; + update_rect->w = scaled_surf->w; + update_rect->h = scaled_surf->h; + SDL_BlitSurface(scaled_surf, NULL, canvas, update_rect); + + /* Bottom right */ + update_rect->x = scaled_surf->w; + update_rect->y = scaled_surf->h; + update_rect->w = scaled_surf->w; + update_rect->h = scaled_surf->h; + SDL_BlitSurface(scaled_surf, NULL, canvas, update_rect); + + update_rect->x = 0; + update_rect->y = 0; + update_rect->w = canvas->w; + update_rect->h = canvas->h; + + SDL_FreeSurface(scaled_surf); + + api->playsound(perspective_snd_effect[which], 127, 255); + } + break; + } + + if (which != TOOL_PANELS) + { + perspective_drag(api, which, canvas, last, x, y, x, y, update_rect); } - perspective_drag(api, which, canvas, last, x, y, x, y, update_rect); } @@ -482,7 +532,6 @@ void perspective_preview(magic_api * api, int which ATTRIBUTE_UNUSED, } } -// No setup happened: void perspective_shutdown(magic_api * api ATTRIBUTE_UNUSED) { //Clean up sounds @@ -546,9 +595,13 @@ void perspective_switchout(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE SDL_FreeSurface(canvas_back); } -int perspective_modes(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED) +int perspective_modes(magic_api * api ATTRIBUTE_UNUSED, int which) { - return (MODE_PAINT_WITH_PREVIEW); + if (which == TOOL_PANELS) { + return (MODE_FULLSCREEN); + } else { + return (MODE_PAINT_WITH_PREVIEW); + } } void perspective_line(void *ptr_to_api, int which ATTRIBUTE_UNUSED, SDL_Surface * canvas,