From 1ab20f18ff3ef1ae5ba5ad1e90b08e965a3cacd2 Mon Sep 17 00:00:00 2001
From: root <root@The-Baron>
Date: Tue, 24 Sep 2024 19:57:54 -0400
Subject: [PATCH] I made a python program file with the superturtle functions I
 needed, because I couldn't figure out how to get superturtle to import right.
 I also added the leaves in, added a branch because the leaves didn't look
 thick enough, and then I colored in the leaves and the trunk.

I'm not sure if it was the best way to do it, but I couldn't figure out
how to color in the woody part of the tree and the leaves at first (I
was trying to do like nested fillcolors, but only the leaves would
color in still), so I duplicated all of the tree drawing functions and
made one without leaves and one with leaves, and I colored in the wood
in the former, and colored in the leaves in the latter.
---
 __pycache__/shapes.cpython-310.pyc    | Bin 1651 -> 3320 bytes
 __pycache__/superturt.cpython-310.pyc | Bin 0 -> 2640 bytes
 drawing.py                            |   9 ++-
 shapes.py                             | 102 +++++++++++++++++++++-----
 superturt.py                          |  70 ++++++++++++++++++
 5 files changed, 162 insertions(+), 19 deletions(-)
 create mode 100644 __pycache__/superturt.cpython-310.pyc
 create mode 100644 superturt.py

diff --git a/__pycache__/shapes.cpython-310.pyc b/__pycache__/shapes.cpython-310.pyc
index a4d032cb1dde5f6c1ae881b2c2684e95cff5823c..701b84e2efeb9f1902c98eed75739a29258ddaab 100644
GIT binary patch
literal 3320
zcmbtWOONA35O(_&CzE8e!>|u#cUeXP*2}_Zb`j5I7l}PBQX~WdF$khe+LMIwIN7#C
z1j?L-12-;+AHZ$y-1!TfedR)KNZdd?zN)qpdzc_3Y;|?Hx@}i~{Z&<u8jYHPYwMj~
z_jjTFL=VNw#KW6t@mCPikRmkRquva~p}A`cZL?srr2VC_YfDGE=p9*+9(q?+Wet5r
zuE{!jPc~!|eN~>5E%Y^cUaq5GlaI*_^mX~TynwzTFUm{koAR=J0{uC;DX*Y!$*b=g
z{<S&0F?^AVn-F&VNF_Z%rtBi!LVF7>ZbKyS{8$Jh5z^$|JT~xT&EWSjR*~4!X1gVw
znX!>uE$J4X9C}9@_<yCHI(uQacaS=L6$H_I7ylSG@!LKWTtDB>lplZa-P9WgQEwEE
zR9f91hM`t#dqIB~b;yvqy`k!bLF%Yse~_eJ5J?_5p~Vfq2u=)j4qyH4^=&m8CEJJH
zgJIO~Ooz#!(;LZP`*7OZ*`7qhWM_M<MxO?~q$5>#ib>n?pgRuY7sj8bRWfzLpu6wj
zTX74*6P|EI4YG;5Ce(QtduWS`ko3?P$xomp#<B7B79$Bn9~d8R92tq3p=vRzHZUcu
zoeWc#tdG18fSrx|*wQHO81aoM=F$COj;zz3ui-EA4H87nc?{uK(oGe_$w&pAIO!%q
zXF3Q7yJ#2>0twu@Q9oesQwLyA#%X1Lq^4aZ6@4zPz$i!42yAhq$>Cn07*H(;iF7ST
z=d&OttmAbEPt+M9!pRfn?^}PVD=@F-+BJ+4*N8QmZ(x|YnemCaW49GAj!;!Dgm0?L
zq|<6ug9QD*;98AcOVlJfxP+0|hNz2mq3CZVUx@QG%DZ(7N*}&_CyvC7cB*k?CdRDf
z*UTjLKXS>l6RYi4=HKEib$yi}f7Mk8-%J~OK)pBU5Lu&;-9NEZ6N9OX?FfT7b+|vh
zo+hs+dpimV(U=ymQEmzQPxUk&SFh|gMoTMety)>aajw^=p2TauRq}hP{pMX&TNwXW
zU#B5WiR%#B*CtqD|Dm3Rq2z5T|2)9x689_*VIPPWnj=}flx;d+W&6eZW4Gte<6BIh
z5_5>+XEMi4hGXoFkMWo`hP)<5>!xnPwA$~782!I~Yy8Q3bpxOCElqWHnD%|O*VB-8
zd6A`ZuRY3A&tarTNi4rer%JWp{nGDQj-$@|Vy1JGG2?vCxQaGHkX@oUJaJMRwB1Qf
zxx?CRXt!CrbDAA>O=3#MQFs?G7kEr4t2?l*_LNrmUp*}#Nr4R{7anW&GBr+Rj)H&F
zkil7Um$(2dUnCESulYqdQke7fZ=mSfiTqJL5(zRJb5_Tdy?C~=3SejBj-=X(C)5Ck
z>g&Re`pRR@DLc=lv64OiuF#d3{!M#^3Ou*q+x!+>pZ`MIL((WC&M5=>uDXa$(~X(N
za1nEO$=GoU2(?L~jGB4|wztt@dXI>g-z{i)BaLU4z#||R;LY$*E(ZDGBLl-a1(Lb2
zmqA+E%OK_U{7_RUJPeZCR<FSa^%9AfNxVYhRS4fML?Yz@rs`SYsGh>;M`-Z{2n|OL
z0`&|8&G`oqv_Z@w2}QGr&JBD<fa}Y;NarwS)siL9vI<(B=}L!Z;*`0VQ7NCx6zaTQ
zH&-hzw%@~pIWgP!6c^qqbX{?YGF)#8fKZg2g+*G=N^uY%;0Kr$)92|BMWuj3p87fk
z);$cYhU9&W(ou>40Tcp91TMu%zNZUFh$Dr=#ByeSyuy(?pHbTN#p)GhCiMmcqJmBk
zg@se;DlGi0<40l5(=fq&PRivKBNpysr0t(i-DIK?oMr99ZZc5BfwUS=#(^R`AJKHa
zTH?+=Fb6q2DQ9wwa(FTQ7)<^{AyzqR`RwN1JsinN7~G@qi?2g?ny98%^QxZhxn2c*
M4bt;kUZY<B8z18@o&W#<

literal 1651
zcmZ`(OK;Oa5Z-lc$4Qg)p^6I+ao}Q9h*FLqK%yrO76?w2P-MJrVwzXi8%3b>R3!cf
zxBd$L0%u<l61gF`aX@@CPU563mUeb_c6R-J^Vng%UKRL$fB$v#(iY+yEml7Zi>Dar
z3kW5Y?1|SjTRqvg4lOBEN!cI8VM#g4#cZpx@-RE9qN<o(wV`U5%c`y#m_4<rwlG)J
z_ABA<%y6slWhU=J*y)KjktEanBfW(23?to#Fk%V}XZWv?$~u#nfnX|j7gnL{Vx<KB
z;RLfooJ<<HtOEt#k0*2G>lfe3+$hmeFU}mDbh_r8a3mk%bD=A6{qwM?heOlshsVjF
z)1D-z+m41RZuTcpt2rJdrqvwj;k!68ZKcBroSJDj9L4GV(fh1Irgkq5j}TjtdJt9V
z$%fpKdIO99lf8vqP?JQ4X+l%hb&w_UOw0~ul)D+-s_A}kDIX2>B-BbfWGs^)7P%nr
ztjds#9uJObozlS?;n{?;hKB-AyBz#IC>`MWEKlWB9*8&fQ;U+Zifw8UwiB1pl>*<H
zeZncdwJzvNU55bN>RTNSqHa4L<cR%}CN`NH4m!O!%^aRDQrKV$`Oya4QzGIauAbbI
z_Fuh=<r<T<GCII+fgHueMU+Q3XM-4Dwk`c=ZxR1{xJ%ba5G&u(1V_6hu8MuhBqIWs
zk{iLTEr-4aQ$$%?e56zNEyG`co-V-T9U!L*!1fZH41k7#(7${qvk}TxW~mly`_T4T
zdvGzjl{~O0<eNCT5?g|+Z@_jbw)7u{Ifb%bweu#m=9N;SW~CNY_L+m`E$j|#wC7x~
zvoGzf*^B01b_nOh4Q7;yWDhBy{Uq%<Y1B==y^<Y@HgmZuPkI}>cQ8_Nqa0CT6@xVP
zxfBR$84kpv$dp9Oa$6Vx<+3U$^SiYywZaqjWghK7QyRFwxY9s_dz;#oD?Mj*Rk`J_
zkI`}5f^$lB+F&v@yg<n1Z5RT-nz?4I4IV(dADXTv4*WRri;(}K2p5Hh53ZCAzcBo`
dc#rx+HSWcaspHZe2#?}td9G(;RJ?Mn{tsPb4_*KO

diff --git a/__pycache__/superturt.cpython-310.pyc b/__pycache__/superturt.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..021c646541f14fa3f09349e353cdabcc6a4d93dd
GIT binary patch
literal 2640
zcmcIm&5s*36t^dnWH$Rz*n$dFAPb5}(6S#?P*GJ?DH6Ty0q7-wEbrJ!rkxoF+tVbg
z?P>dGa6#g-|I%DJaqf*1?|Cw_Y5KtlNA`H^H}?DZz2A%8-tG}-zkl<5^hcMFzwl+X
zwczC*bbB8LNhD3lPxuT{ngzokYYkhJJRq_q!)HW>=fN<PJ=u}nXLQ(x^+;~O`Ub3b
zWcx=l*!&yLAp=^{&j&%-jwd3?;jxHQ730oo3*hA*^ydr)MTS(8VIb+SB?H-dM&PDU
zw&B^99XPpLM!DuvrD7p|poDzOVx2oRcPtaR7%RhOlO&$7SQJ)SCXJXS`51(xVoozt
z<Sfap6S+$l`@J5k+V|QpH5b`5Rkv?9t88R+##~`ss#uauwQ+2u%}f}%$4oMwxcd7_
z(iT%?D)IeHKT(;=UGrVK*kiTkm!GAJ{uf7I9qut02F>y;ag#>4Ke*j&pthg^OTY+b
zL_SviTVEco2`q(B&Hl~9m18SgS*3da*3spKNj@!Hzj}|st4+f>g5x{r_9GY^IVWd?
zQy2JW-~cR=o(B}*0^tdc4Sq6cl^th9tV~HE@IG7@v<$6EM;F9wfyh614~*9CAQO)v
zKpaix7^Q=379SlHdE$-^rba(fvE$1q9yAW#pDxM`&cVORaDEk)>%b7vi0;tS-P+Il
zjYu5AcHMB^81){!piz`KdPW`v&|9@R7xZ`#mYrfM1zZG)LrjFj1`LDHY{H|A)I8>H
zF;(RT&Yp<0fT=hBM8uE1t<|vY#X+Tc;yA~9Eo#!CyY%$!Rh9kz@kOVMIL}3<I4^sg
zXId61&bK)Ktq|#Qr^~t2G3RCn&NA=dfbLxx@Lq%N!P_hv5Rs5ZJ6mnPdK_a0)(vH_
z`+(np$r*&V0K3n~FTqptl%lU-7Cdb^>b(XYI}5IX+*#`yLC?7su1kt=5Cy=&!}p<g
zqGfIZiRe@6Gs~vhCN9zW9urbxp3X5zUl554V=#~AOyrU+mizw5=9pS$vCsU*1C=Wy
zQcO8FNh})`d5qUEJJCfd*@*&vNK+-5&onpFOqg+j`D*vrNdZ}le6sL|iPY-#F9b^y
z>pb-UvsH>$>iPKFmq?^RZmM3Qh6-N1_JzL`Q*~{<e*`oE$^P2?pDTf1D+xqyRG(S4
zrz$U|WjNMOmtA;~dX|F(otG3+Y3V>dznm`C5L8}S)8|6~hefDGn-T3%gmI6Wk6|H(
z{z5~5-Ggr0FaU*LH_AF~6bB-9iq9r0=Ogf=ohT{(tP%4%YBws@M!p6~9wiec5KUG1
zoX69N8Yj7r6vk<Jzds{mq7nh8Fg^0pzFeH7I)1$G5BdM=!y7!(1RR+kI3J5q&Hez1
zn_v6#u~q~;u-|a#dR0Nd`I6T6H(a6&H?S=WAE0mv!I$a;M%mK_lF+hF0I62>0;_|$
zg5eL$2k<Dn%ODy2XR?Mh&t-RE-4kR)x9I7oZ?I*B=CSzH4fVnP0J^;a!z#_6QzR-N
z`_RwYp0XMpJLWpbmz!3(I)y5&d$3X~jz=2I0x-#!f)Gf=uA73+xDVYEZwFEYf2TM8
z!<?!Fn0N7tSJC+=uyI(Q>gjxYD>S%TIk^k<*OP3ykwEEkTBp{ua2v_p^S)2j>XTR8
ZP)2vEf^!#LYB5L=d5i7@z4v#o{tMQuo<INq

literal 0
HcmV?d00001

diff --git a/drawing.py b/drawing.py
index 95cebb8..954c5d3 100644
--- a/drawing.py
+++ b/drawing.py
@@ -2,12 +2,17 @@
 # ----------
 # By Stacy S
 #
-# (Trying to draw a tree.)
+# (Drew a tree.)
 
 from turtle import *
 from math import sqrt
 from shapes import *
+from superturt import *
 
-draw_tree(20)
+with no_delay():
+    with restore_state_when_finished():
+        draw_tree_nl(20)
+    with restore_state_when_finished():
+        draw_tree_wl(20)
 
 input()
\ No newline at end of file
diff --git a/shapes.py b/shapes.py
index 45ffddf..0bbdc75 100644
--- a/shapes.py
+++ b/shapes.py
@@ -1,23 +1,53 @@
 from turtle import *
 from math import sqrt
+from superturt import *
 
 def draw_leaf(size):
+    pencolor('black')
+    fillcolor('green')
+    begin_fill()
     circle(size,90)
     right(270)
     circle(.75*size,90)
     circle(-.25*size,90)
+    end_fill()
+
+def draw_leaves():
+    with restore_state_when_finished():
+        for number in range(11):
+            draw_leaf(20)
+            penup()
+            forward(10)
+            right(115)
+            pendown()
 
 def draw_trunk(size):
     forward(10*size)    
     circle(size/8,90)
 
-def draw_branch(size):
-        angles = [135, 135, 135, 135, 90]
+def draw_branch_nl(size):
+        angles = [150, 150, 150, 150, 150, 150, 90]
         for angle in angles:
-            branch_end(size)
+            branch_end_nl(size)
             circle(size/8,angle)
 
-def tip(size):
+def draw_branch_wl(size):
+        angles = [150, 150, 150, 150, 150, 150, 90]
+        for angle in angles:
+            branch_end_wl(size)
+            circle(size/8,angle)
+            draw_leaves()
+
+def tip_nl(size):
+    forward(size)
+    right(45)
+    forward(size/10)
+    right(90)
+    forward(size/10)
+    right(45)
+    forward(size)     
+
+def tip_wl(size):
     forward(size)
     right(45)
     forward(size/10)
@@ -25,32 +55,70 @@ def tip(size):
     forward(size/10)
     right(45)
     forward(size)
+    draw_leaves()        
 
-def branching(ang1, d1, ang2, d2, ang3):
+def branching_nl(ang1, d1, ang2, d2, ang3):
     right(ang1)
     forward(d1)
     right(ang2)
     forward(d2)
     right(ang3)
 
-def branch_end(size):
-    forward(4*size)
+def branching_wl(ang1, d1, ang2, d2, ang3):
+    right(ang1)
+    forward(d1)
+    right(ang2)
+    forward(d2)
+    right(ang3)
+    draw_leaves()
+
+def branch_end_wl(size):
+    for number in range(3):
+        forward(size)
+        draw_leaves()
+    forward(size)
     right(300)
-    tip(size)
-    branching(240,size,330,size,330)    
-    tip(size)
-    branching(30,size,240,size,30)
-    tip(size)
-    branching(330,size,330,size,240)
-    tip(size)
+    tip_wl(size)
+    branching_wl(240,size,330,size,330)    
+    tip_wl(size)
+    branching_wl(30,size,240,size,30)
+    tip_wl(size)
+    branching_wl(330,size,330,size,240)
+    tip_wl(size)
     right(300)
     forward(4*size)
 
-def draw_tree(size):
+def branch_end_nl(size):
+    forward(4*size)
+    right(300)
+    tip_nl(size)
+    branching_nl(240,size,330,size,330)    
+    tip_nl(size)
+    branching_nl(30,size,240,size,30)
+    tip_nl(size)
+    branching_nl(330,size,330,size,240)
+    tip_nl(size)
+    right(300)
+    forward(4*size)
+
+def draw_tree_nl(size):
+    fillcolor('brown')
+    begin_fill()
     circle(size/4,90)
     draw_trunk(size)
-    draw_branch(size)
+    draw_branch_nl(size)
     forward(10*size)
     circle(size/4,90)
+    right(180)
+    forward(2*size)
+    end_fill()
 
-    
\ No newline at end of file
+def draw_tree_wl(size):
+    penup()
+    circle(size/4,90)
+    draw_trunk(size)
+    draw_branch_wl(size)
+    forward(10*size)
+    circle(size/4,90)
+    right(180)
+    forward(2*size)
\ No newline at end of file
diff --git a/superturt.py b/superturt.py
new file mode 100644
index 0000000..8270ebd
--- /dev/null
+++ b/superturt.py
@@ -0,0 +1,70 @@
+from turtle import *
+from itertools import chain, cycle
+
+class no_delay:
+    """A context manager which causes drawing code to run instantly.
+
+       For example::
+
+        from turtle import forward, right
+        from superturtle.movement import fly, no_delay
+        fly(-150, 150)
+        with no_delay():
+            for i in range(720):
+                forward(300)
+                right(71)
+        input()
+    """
+
+    def __enter__(self):
+        self.n = tracer()
+        self.delay = delay()
+        tracer(0, 0)
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        update()
+        tracer(self.n, self.delay)
+
+
+def update_position(x, y=None):
+    """
+    Updates the turtle's position, adding x to the turtle's current x and y to the
+    turtle's current y. 
+    Generally, this function should be called with two arguments, but it may
+    also be called with a list containing x and y values::
+
+        from superturtle.movement import update_position
+        update_position(10, 20)
+        update_position([10, 20])
+    """
+    if y is None:
+        x, y = x
+    current_x, current_y = position()
+    penup()
+    goto(x + current_x, y + current_y)
+    pendown()
+
+
+class restore_state_when_finished:
+    """
+    A context manager which records the turtle's position and heading
+    at the beginning and restores them at the end of the code block.
+    For example::
+
+        from turtle import forward, right
+        from superturtle.movement import restore_state_when_finished
+        for angle in range(0, 360, 15):
+            with restore_state_when_finished():
+                right(angle)
+                forward(100)
+    """
+
+    def __enter__(self):
+        self.position = position()
+        self.heading = heading()
+
+    def __exit__(self, *args):
+        penup()
+        setposition(self.position)
+        setheading(self.heading)
+        pendown()
\ No newline at end of file