From 9c3b619fca8a662ee14f9c02321617882685807e Mon Sep 17 00:00:00 2001
From: William Kendrick <wkendrick@users.sourceforge.net>
Date: Sat, 5 Jun 2010 01:39:08 +0000
Subject: [PATCH] Added 1-axis symmetric paint Magic tools (based on the 2-axis
 Kaleidoscope)

---
 docs/CHANGES.txt                    |   7 +++-
 magic/icons/symmetric_leftright.png | Bin 0 -> 798 bytes
 magic/icons/symmetric_updown.png    | Bin 0 -> 962 bytes
 magic/src/kalidescope.c             |  52 ++++++++++++++++++++++------
 4 files changed, 48 insertions(+), 11 deletions(-)
 create mode 100644 magic/icons/symmetric_leftright.png
 create mode 100644 magic/icons/symmetric_updown.png

diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index b57ee3ec0..c5d0999ad 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -8,7 +8,7 @@ http://www.tuxpaint.org/
 
 $Id$
 
-2009.May.28 (0.9.22)
+2009.June.4 (0.9.22)
   * New Tools:
     ----------
     * Label - A tool to add text to a drawing, which can be modified or
@@ -32,6 +32,11 @@ $Id$
     * ROYGBIV Rainbow - Draw a rainbow arc using solid colors of
       Red, Orange, Yellow, Green, Blue, Indigo and Violet.
 
+    * Symmetry Left/Right, Symmetry Up/Down - Paint with relfective symmetry
+      across the horizontal or vertical center of the image.
+      (Like Kaleidoscope, but only one mirrored brush, either left/right
+      or up/down.)
+
     * Wet Paint - Draws a light coat of paint, and smudges at the same time.
       (Based on Smudge tool.  Requested by gallery artist Angela.)
 
diff --git a/magic/icons/symmetric_leftright.png b/magic/icons/symmetric_leftright.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec466cd72943c9ef93c3528c56b95534af470d62
GIT binary patch
literal 798
zcmV+(1L6FMP)<h;3K|Lk000e1NJLTq001Ze0015c1^@s6Ufo>X00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01pxX01pxYA)E3u00007bV*G`2igV&
z0U-<BU^XWJ000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0007cNkl<Z
zSi{ZOOQ=p!6u|M{{_ef5M_$(>gi@4&3CR!%8F{1>rEa89n3!NfN*TDt6fre3Fffs1
zpa^-SC`I06a3xA|OxAZhecXG`<D<LkboO`FUTgo)+H3E<&L_(<buJ_{(1$O$j}KVX
z)YtOg2Eb0-z)!4;XIGG6V_nF)aAWWaZ_pFbOrbj!kelm3R-V?lUkHdPgY-KR`q@>3
z&`?3LEXz_#C(w)Y*pgBjo9~lSS{1qZ9uHGWb5tCxY82N;bTZt-q!#_Yoc=LJSDEIj
zQ@be!eum|P^^102^u2;{{|qn(*UYQqC2S_)IeuYInMG3;?pVNWtC$v#(T_1jA<Mw^
z2Hfhh+eXgEDBQtUjIJHQoa0>qcVMV~1z{Wbj7LRmi#VK~TaACaE)8KjGy41*#P&&B
zBKVi*hhl)M=o%^t*oyDCjU{EHUpRlFy*<EQVC8TFwAfw@+nbo)mTe}NgY)n@2G~*K
zXl&p?_&JQuVPCR<(+%P9GP<iC{4LR37SsN=30W902R1RvsDag+uU6{Rk8z)Zcld$*
zg#dHLdjsqm7S^p9hl%Fy+<89!4}FVaH_nE^!FE){1%W5yZj8I4C0GNE1yOi@!s7o0
z*8+2?nNsK&0L0NyTyNLZ)$p+f-y&GE63$^~Jh)$`l*Cd@KnM0_S#}|c)t=bz=7#Pe
zK1MK#NGI0eXD6QGWK8Yz5>DVuY}&WtL}^L`({MVbZGOoY?~a`8Xjcxs!`j^M@d3W4
zuJ20UB!ft+uk<gRjyP#2U^dbLXXM&l&9AtT0{AA1(x&u>@0TM5@Egvhl(LjkfBa7~
cHSV?KH@!yROq)*is{jB107*qoM6N<$f)?p-egFUf

literal 0
HcmV?d00001

diff --git a/magic/icons/symmetric_updown.png b/magic/icons/symmetric_updown.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b61ebf813bd6a7d230fa0f2d2909ba4cd451162
GIT binary patch
literal 962
zcmV;z13mnSP)<h;3K|Lk000e1NJLTq001Ze0015c1^@s6Ufo>X00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01pxX01pxYA)E3u00007bV*G`2igV&
z0U;i+z0%A8000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0009WNkl<Z
zSi{ZNTZmOv90u^8XT~!*W7KFCqZ1`q5o+|Hg<Xvbqf8&VJrqd@QA7hhR7A~-)kA^y
zP!R=@LYYKV&;_C(DNT&-A$GILFe|1YFWsE<^zsetj-xZ4v*FAKi*wdqYybJy_h0|Z
zZc`qXV>6bZf?u$^S)-K_34WH}_i!UV#2LmJc48IU@iIO_M;V6OOCoq1hGK7a+<bSl
zMpt4Dp2W>Ku?br<@Eh*S{6W-kS~CP+i_wSiDgMA4xVk}mFJMDqz6WnLL-08Kgj+K|
z6Pxfa-o(r?T#rt4V+x+YcFadl0;Yy#m~f<lIRS0B9}92|e$Cq1cqndLf~|G$cH#<L
zg1NCXl;1r#P$1NcN!S)IZH~%2$4d0vT<H0A&yU9^_!%b@o?ncCDDw*DWPJ*b4*8CZ
zVRd_OAzsaUyYm0!u@IbvALEXCoRYPT=t4jCCXGyM;%eQF_oMoX(QF-q*YPx}BdpKP
zskh;G+)!ffT#OyLx0fGo<Ep4M=@9GpVqMfO8%N>sh|r(Adk|LOo4B!6SQe7&FtxrG
zA1JY+G>SF2G(r0!rdR6n+3uX6m3SNHCta<t)aAr|<A9(9;totMx^yU2rP5+@r{no3
zxTv1Y{uYrMj@kw3Bmcrud{HFWg~0^NNVo|PBxjb5cJw82zm!1vuDD@xD#LS!NYp*}
zClzD>3ri$7FU0m18kU1FGgac25t3vVwq*2Tb%JSSlf)LLHLKy-(Q5KpiJWsrkp7)?
zC-Vx=`_e=1$6ZmlJBR6r7uqtaX&9#Br0gF|JGTXwjdnRJY0Iy~Rp||f-TFvQdM)0~
z{#rrx#i^gY_%nnD<F2;suZH*x{Ectp(oOhaEK+ylYuuB0N9y7}d=+&MhboTEfu`e`
zv}en)D4lsNs!z-~B0LuN-ifsdhOJSxvw^#{It}SCzR%ZPwbAhI$z8YzpW{4y++a?e
zmK3oz^E-0yu8T(+!o+mJWqiM0pNiBSVgq<|Jbk!-nT`aW!VfKO-~NYF<Hr8vw_Uhk
kJgL_gf`iEdbIUOLA48Y1TbDJ6@&Et;07*qoM6N<$f(#G98~^|S

literal 0
HcmV?d00001

diff --git a/magic/src/kalidescope.c b/magic/src/kalidescope.c
index b718a20bd..6e2dc8443 100644
--- a/magic/src/kalidescope.c
+++ b/magic/src/kalidescope.c
@@ -41,6 +41,19 @@ static Uint8 kalidescope_r, kalidescope_g, kalidescope_b;
 
 Uint32 kalidescope_api_version(void) { return(TP_MAGIC_API_VERSION); }
 
+enum {
+  KAL_UD,
+  KAL_LR,
+  KAL_BOTH,
+  KAL_COUNT
+};
+
+char * kal_icon_names[KAL_COUNT] = {
+  "symmetric_updown.png",
+  "symmetric_leftright.png",
+  "kalidescope.png",
+};
+
 
 // No setup required:
 int kalidescope_init(magic_api * api)
@@ -54,10 +67,9 @@ int kalidescope_init(magic_api * api)
   return(1);
 }
 
-// We have multiple tools:
 int kalidescope_get_tool_count(magic_api * api)
 {
-  return(1);
+  return(KAL_COUNT);
 }
 
 // Load our icons:
@@ -65,8 +77,8 @@ SDL_Surface * kalidescope_get_icon(magic_api * api, int which)
 {
   char fname[1024];
 
-  snprintf(fname, sizeof(fname), "%s/images/magic/kalidescope.png",
-	   api->data_directory);
+  snprintf(fname, sizeof(fname), "%s/images/magic/%s",
+	   api->data_directory, kal_icon_names[which]);
 
   return(IMG_Load(fname));
 }
@@ -74,13 +86,25 @@ SDL_Surface * kalidescope_get_icon(magic_api * api, int which)
 // Return our names, localized:
 char * kalidescope_get_name(magic_api * api, int which)
 {
-  return(strdup(gettext_noop("Kaleidoscope")));
+  if (which == KAL_LR) {
+    return(strdup(gettext_noop("Symmetric Left/Right")));
+  } else if (which == KAL_UD) {
+    return(strdup(gettext_noop("Symmetric Up/Down")));
+  } else { /* KAL_BOTH */
+    return(strdup(gettext_noop("Kaleidoscope")));
+  }
 }
 
 // Return our descriptions, localized:
 char * kalidescope_get_description(magic_api * api, int which, int mode)
 {
-  return(strdup(gettext_noop("Click and drag the mouse to draw with symmetric brushes (a kaleidoscope).")));
+  if (which == KAL_LR) {
+    return(strdup(gettext_noop("Click and drag the mouse to draw with two brushes that are symmetric across the left and right of your picture.")));
+  } else if (which == KAL_UD) {
+    return(strdup(gettext_noop("Click and drag the mouse to draw with two brushes that are symmetric across the top and bottom of your picture.")));
+  } else { /* KAL_BOTH */
+    return(strdup(gettext_noop("Click and drag the mouse to draw with symmetric brushes (a kaleidoscope).")));
+  }
 }
 
 // Do the effect:
@@ -104,9 +128,17 @@ static void do_kalidescope(void * ptr, int which, SDL_Surface * canvas, SDL_Surf
       if (api->in_circle(xx, yy, 8))
       {
         api->putpixel(canvas, x + xx, y + yy, colr);
-        api->putpixel(canvas, canvas->w - 1 - x + xx, y + yy, colr);
-        api->putpixel(canvas, x + xx, canvas->h - 1 - y + yy, colr);
-        api->putpixel(canvas, canvas->w - 1 - x + xx, canvas->h - 1 - y + yy, colr);
+
+        if (which == KAL_LR || which == KAL_BOTH) {
+          api->putpixel(canvas, canvas->w - 1 - x + xx, y + yy, colr);
+
+          if (which == KAL_BOTH) {
+            api->putpixel(canvas, canvas->w - 1 - x + xx, canvas->h - 1 - y + yy, colr);
+          }
+        }
+        if (which == KAL_UD || which == KAL_BOTH) {
+          api->putpixel(canvas, x + xx, canvas->h - 1 - y + yy, colr);
+        }
       }
     }
   }
@@ -124,7 +156,7 @@ void kalidescope_drag(magic_api * api, int which, SDL_Surface * canvas,
   update_rect->w = canvas->w;
   update_rect->h = canvas->h;
 
-  api->playsound(kalidescope_snd, 255, 255);
+  api->playsound(kalidescope_snd, 128, 255);
 }
 
 // Affect the canvas on click: