From 1aac389b534644b3b3d417eaefef3481fff6bb80 Mon Sep 17 00:00:00 2001
From: Alexander Taylor <alexanderjohntaylor@gmail.com>
Date: Wed, 30 Jul 2014 22:19:13 +0100
Subject: [PATCH 1/4] Added canvas texture example (tex_coords, wrap)

---
 examples/canvas/texture.py | 126 +++++++++++++++++++++++++++++++++++++
 1 file changed, 126 insertions(+)
 create mode 100644 examples/canvas/texture.py

diff --git a/examples/canvas/texture.py b/examples/canvas/texture.py
new file mode 100644
index 000000000..919caa817
--- /dev/null
+++ b/examples/canvas/texture.py
@@ -0,0 +1,126 @@
+'''
+Example of changing texture properties and the properties
+of its containing rectangle.
+'''
+
+
+from kivy.uix.widget import Widget
+from kivy.properties import ObjectProperty, ListProperty, StringProperty
+from kivy.lang import Builder
+from kivy.clock import Clock
+from kivy.base import runTouchApp
+
+
+class TextureAccessibleWidget(Widget):
+    texture = ObjectProperty(None)
+    tex_coords = ListProperty([0, 0, 1, 0, 1, 1, 0, 1])
+    texture_wrap = StringProperty('clamp_to_edge')
+
+    def __init__(self, **kwargs):
+        super(TextureAccessibleWidget, self).__init__(**kwargs)
+        print 'children', self.canvas.children
+        # self.texture = self.canvas.children[-1].texture
+        # self.texture.wrap = 'repeat'
+
+    def update(self, dt):
+        tcs = self.tex_coords
+        for i in range(0, 8, 2):
+            self.tex_coords[i] += dt/3.
+
+
+root = Builder.load_string('''
+<TextureAccessibleWidget>:
+    canvas:
+        Rectangle:
+            pos: self.pos
+            size: self.size
+            source: 'colours2.png'
+            tex_coords: root.tex_coords
+
+<SliderWithValue@BoxLayout>:
+    min: 0.0
+    max: 1.0
+    value: slider.value
+    Slider:
+        id: slider
+        orientation: root.orientation
+        min: root.min
+        max: root.max
+        value: 1.0
+    Label:
+        size_hint: None, None
+        size: min(root.size), min(root.size)
+        text: str(slider.value)[:4]
+
+BoxLayout:
+    orientation: 'vertical'
+    BoxLayout:
+        SliderWithValue:
+            orientation: 'vertical'
+            size_hint_x: None
+            width: dp(40)
+            min: 0
+            max: 5
+            value: 1
+            on_value: taw.tex_coords[5] = self.value
+            on_value: taw.tex_coords[7] = self.value
+        SliderWithValue:
+            orientation: 'vertical'
+            size_hint_x: None
+            width: dp(40)
+            min: 0
+            max: taw_container.height
+            value: 0.5*taw_container.height
+            on_value: taw.height = self.value
+        AnchorLayout:
+            id: taw_container
+            anchor_x: 'left'
+            anchor_y: 'bottom'
+            TextureAccessibleWidget:
+                id: taw
+                size_hint: None, None
+    BoxLayout:
+        size_hint_y: None
+        height: dp(80)
+        BoxLayout:
+            orientation: 'vertical'
+            size_hint_x: None
+            width: dp(80)
+            Label:
+                text: 'size'
+                text_size: self.size
+                halign: 'right'
+            Label:
+                text: 'tex_coords'
+                text_size: self.size
+                halign: 'left'
+        BoxLayout:
+            orientation: 'vertical'
+            SliderWithValue:
+                min: 0
+                max: taw_container.width
+                value: 0.5*taw_container.width
+                on_value: taw.width = self.value
+            SliderWithValue:
+                min: 0.
+                max: 5.
+                value: 1.
+                on_value: taw.tex_coords[2] = self.value
+                on_value: taw.tex_coords[4] = self.value
+                
+    BoxLayout:
+        size_hint_y: None
+        height: dp(50)
+        Button:
+            text: 'clamp_to_edge'
+            on_press: taw.texture_wrap = 'clamp_to_edge'
+        Button:
+            text: 'repeat'
+            on_press: taw.texture_wrap = 'repeat'
+        Button:
+            text: 'mirrored_repeat'
+            on_press: taw.texture_wrap = 'mirrored_repeat'
+    
+''')
+
+runTouchApp(root)

From 8fc1c193edac22d5c2500df60adae20ceedb2457 Mon Sep 17 00:00:00 2001
From: Alexander Taylor <alexanderjohntaylor@gmail.com>
Date: Wed, 30 Jul 2014 22:23:36 +0100
Subject: [PATCH 2/4] Fixed texture example bug with finding texture

---
 examples/canvas/texture.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/examples/canvas/texture.py b/examples/canvas/texture.py
index 919caa817..b320009e6 100644
--- a/examples/canvas/texture.py
+++ b/examples/canvas/texture.py
@@ -18,18 +18,18 @@ class TextureAccessibleWidget(Widget):
 
     def __init__(self, **kwargs):
         super(TextureAccessibleWidget, self).__init__(**kwargs)
-        print 'children', self.canvas.children
-        # self.texture = self.canvas.children[-1].texture
-        # self.texture.wrap = 'repeat'
+        Clock.schedule_once(self.texture_init, 0)
 
-    def update(self, dt):
-        tcs = self.tex_coords
-        for i in range(0, 8, 2):
-            self.tex_coords[i] += dt/3.
+    def texture_init(self, *args):
+        self.texture = self.canvas.children[-1].texture
+
+    def on_texture_wrap(self, instance, value):
+        self.texture.wrap = value
 
 
 root = Builder.load_string('''
 <TextureAccessibleWidget>:
+    on_touch_down: print self.canvas.children
     canvas:
         Rectangle:
             pos: self.pos
@@ -90,10 +90,12 @@ BoxLayout:
                 text: 'size'
                 text_size: self.size
                 halign: 'right'
+                valign: 'middle'
             Label:
                 text: 'tex_coords'
                 text_size: self.size
                 halign: 'left'
+                valign: 'middle'
         BoxLayout:
             orientation: 'vertical'
             SliderWithValue:

From 92b0b544827b81440e5cdf8c08af861bf7e775f4 Mon Sep 17 00:00:00 2001
From: Alexander Taylor <alexanderjohntaylor@gmail.com>
Date: Wed, 30 Jul 2014 22:27:22 +0100
Subject: [PATCH 3/4] Changed texture example ui to be clearer

---
 examples/canvas/texture.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/examples/canvas/texture.py b/examples/canvas/texture.py
index b320009e6..3ad4ed2c0 100644
--- a/examples/canvas/texture.py
+++ b/examples/canvas/texture.py
@@ -113,6 +113,11 @@ BoxLayout:
     BoxLayout:
         size_hint_y: None
         height: dp(50)
+        Label:
+            text: 'texture wrap:'
+            text_size: self.size
+            valign: 'middle'
+            halign: 'center'
         Button:
             text: 'clamp_to_edge'
             on_press: taw.texture_wrap = 'clamp_to_edge'

From 256a9373b579f7a22df660b4defe7fc4a62162fd Mon Sep 17 00:00:00 2001
From: Alexander Taylor <alexanderjohntaylor@gmail.com>
Date: Wed, 30 Jul 2014 22:33:53 +0100
Subject: [PATCH 4/4] Added image for texture example

---
 examples/canvas/texture.py                |   4 +---
 examples/canvas/texture_example_image.png | Bin 0 -> 5463 bytes
 2 files changed, 1 insertion(+), 3 deletions(-)
 create mode 100644 examples/canvas/texture_example_image.png

diff --git a/examples/canvas/texture.py b/examples/canvas/texture.py
index 3ad4ed2c0..396d44faf 100644
--- a/examples/canvas/texture.py
+++ b/examples/canvas/texture.py
@@ -26,7 +26,6 @@ class TextureAccessibleWidget(Widget):
     def on_texture_wrap(self, instance, value):
         self.texture.wrap = value
 
-
 root = Builder.load_string('''
 <TextureAccessibleWidget>:
     on_touch_down: print self.canvas.children
@@ -34,7 +33,7 @@ root = Builder.load_string('''
         Rectangle:
             pos: self.pos
             size: self.size
-            source: 'colours2.png'
+            source: 'texture_example_image.png'
             tex_coords: root.tex_coords
 
 <SliderWithValue@BoxLayout>:
@@ -127,7 +126,6 @@ BoxLayout:
         Button:
             text: 'mirrored_repeat'
             on_press: taw.texture_wrap = 'mirrored_repeat'
-    
 ''')
 
 runTouchApp(root)
diff --git a/examples/canvas/texture_example_image.png b/examples/canvas/texture_example_image.png
new file mode 100644
index 0000000000000000000000000000000000000000..c0e54c5146ede74e4ff827fd4f600a99268d2621
GIT binary patch
literal 5463
zcma)Ac|4SB`=6~DYDSc5kdU$@Oj)yMNhDG4k=<B2ktJIx>oCVy5*5lRTU0t(vzKMY
znbIjt*)?HMOk`&;*7ts<e(&%7{QmlVjL$RAbzj%_TJGz9p1HmWR+gr??V{UZFc{A4
zwDEZu3_*gy;CJ{CK=ShLsX%Z+yPYvLhHXKAxeW!WK*H~T+AatN+p!z^hr=Fb;(-to
zY<AWJGl1Q@7bDpiC_e~9;$Hu<4K}*!>wC#B7~H~OMuC@HgD-hVhIj>gN}8ITwenE9
zgn_|?>&%Q#{_6&FYM|k2|8fLv?&IAMVLP+2k0N<z$X5Hr1T~H4apGNnn`mC)ll0y5
zFq$c>+|Bf3<j|~*tc2vYhvi2f68sbk*YW(vKW6XeY5z2`VTa(lWwPP<5u-R2W!Z$h
z8;53=8{&F*oT6za4m<9mZgBOSyfjFz9Q~IoE_36l&$)8M?-nb3Far|YfE3-dq*Knm
z%iRyY8g3jer}7c_2rx++^dZ5JKR+-87W#mN|FdQqA~UaYca3M9mAqaFBg2sYt?X}H
zkUuJ{%15xORIxnypT)&@Udpb~Fyz|`43>wRggNs`l4gLopL>!7hruZUqA|sWK;2{^
zoyH4<UTZ;XOo5~Da+zdE^B#Yn)KNhq4Ta?+WRT!+v;~a>qkF3L2?9XjHi!L?4y<lF
zbjMH!Dc$ivR71{$ryW&4nsl;3l)@i&fynL@HQ78qNs7*Um4HHE5Al~hIt^@xGwBF8
zdY8Yz4ix@0?Kh$zQL+scuJlk8f|!bX`MVe%ED%s%&}cY1@#h`w>>;2AXP1Fes{XVu
z+l~X6Lz0jm5-;$F{Cy`t;J?&RJT(+vkci(|9Sx#T^+AHP`E6qX?Egco7r!Q9Oy?!D
zf2cVQ0Y%q(1oB2{fzm)QpelMH)=#PyLEmDvc5^WSET~9_@G;v!4uV7jk}H<yuVeNg
z28#1HPbj`ZsLZ0g(x7;@KZEM{m6Fr{DwRvwl0fJvcr}!*@RY^32O~QrG!wT$!Pr51
zZGw|>d-(`NK9E&2Io}qFjEAhMmqe+69JMn{7S69X{oFlks6fALtW-<gK&N<x3*J8S
z@(KiycpzrLl(#t&{Ltn^Kvf5eq4G8n0+KY66vzsXJTMA_qdTxo`*2MFzKLNRDR0C3
z8Y9)$k_JTgeqD#_E%*^wd<<wjBf>9p0tyL<TyI!JPN=|MXC|+kw64pK<(Q6j!gdp^
z`UTg|y&O@v2lhFSn+Unbv37%!0t?iMKekQISbX~^y>_9M8t;{Z&LBmPP==zClpW1L
z(1~MC0ze-=6KJs2heQjEI0+EoNG}R;CJ-Do{@Qz}4I;m&X4n2n^IgCaWmKkMMnr%{
z6y0F~ie~8^&5u9bGZf#!{1)Em!0{sS<K<3gr)Nj3k1pwNU0?QTDS*ombNSksZ!Y&L
zP`Ms!DO*<AKF%3l46enH<_A5*P!{=Wz8?2&_xy*dzzTJ1hD6%ta)?UX2^@Mi;S;NA
zd8zHgfWqjz?u7WhKL^9DBhGuZW#7Ev>PD{ur(oy_h86aprR7%os95@`h(Pz(UEBxN
z<vonWvGLNQ#`Jc(81#}v_{EZRYOTFrm+V5(;+XOco2c2v7qOloQ`rLRocf5MiMFPi
zN3ozahTeR$8=p>}?<l^Y(A&tG(<SkwsLGEHiUSYro#d##vk`4AMQX2(MXVO?NDuG9
z@FB2^IxE*14!W5+I_uPSL(uO2MNKtpdDiDZB)@aUTbcdiar?qEBxy9)A7SiMqf2dn
zAsG%0owp`Bv&Q#bZhY-OF?T{j9@yPslrOM*7222qIkBuFy#%?>SPETiC5&blzBQ1a
zCBfAH*f{z?d_q}Ah+9Z4=;nlJZB0C)VoyD9ROtNx%24C9Fx73-6B;^IqvEa4oy&5$
zuZE{c(>@nc+ZvzNm2T72Zilfk=-LG%?-{mZwusx5sXCLR+oV4kI@R7;NY(yQyGZU%
ziTH;=gfk9aaeCY~IPXw;Qg{Ae1Kwo|HS0b6K^M|Rf^V;Wn|FJ<QMFxm6SJ(d7i&P$
zRx55`GMSOD#QibrHydq6#tMJ)dzdaFIi;+2rFYr*eip0CIlkmuMHF?tR1}L*m|Ajw
zt;^yB`98M~J06u4mjA9TUhTqh`Gy5w_HNbAOl|67LL2eB1F0^Kc|E}8mePRPbaFu5
zyD|6eMKf7q>7#GW_3vjbb3nBE>zt@QECsn(i^`gcU8)kf7{KDb>SleP^Iiz(^tW(X
zyw<two82w3&KiljIRClg_N`3?Qobdv)THKF?Z%%ek4gpJxwX!1J?P##%OY=1>*Z{K
z(q+4>zWJT7xQp1n$DKlLlnv`#=JP?*A0zvn<u^_TV~#g3ON*LY?BqDTR=ZZN5s@<F
z^L2##^c<sj-H<$d8%9;1?2(?x)4p@e&sa6-ZM{Rz;AhR_m~x`aXzd<rjY)y}qi#}e
zkG+rj8TVgwTl(v26DFJW{>T2Z()Z^s9-I*B=5rZ6A^c4Gh0sEn_ns+Mq_B{Xn2?yB
zBuBhxwRtcE{UA@ZLY-YGnwwu)_rnMuO`V=Dwq&u^nk;l8?>TB{>0ru-Zu75PkobGH
z<=~jKl4;j6#a(4?r8{K2rwbg&l)~L)?&aF_D)qv1EybUy-q|^QWkYC$4)bt{Nxj6e
z;y3w48&!=pS1k{}n*5Twue-p(?#JTAeLiS1EG0BS`_Y@K`18g}bZJ{wckKHw8U@qN
zB8#il4XyTdosU$!g9;AhEVxJ@CXMh;1G3d)(qoEeQ|u$aX}rqHd>wK#P;Np@NW1gV
zk1A7#&nh@H{J^7Ky@R$72mNilzyGKU_MR9Voo^2Iir;Mgf=iam+MI|nYUd-k=ZATP
z>WxGo=lpv^46>P;hGZuT1pGj6bS*P|_@THPN0DjMV_&M<K}2P|l!#|bzvy||t#Oj9
zQ2beCr*dt^A25{?WWZGSwQ)yEcTFz3ZhsO?n(p+YL+uNF!r=}`6GSAM1fvhuoWK5T
z7$;)GYSg%);GGpZPrs1z(Tjjc!p=B}UpGG!u{Lw5=ZcHK(&@bjtdq!eX2(5O&Qwa)
zcw5`V?i3Fx+UyI4yrPIwedE*vnHeXgl=UcENGwSw=WQtNSXMeG(Ccs!yu~eYRCIRF
z^~FAo^y-Qmci5|nM`a*X`fu7W8;13|z;+3S({n-9Qw^6U8eB#6q`(t(>d}Q9r_v<X
z2sJ#MGN_Vi;={!2MXwINvgWRbjs{$F%hbo<PLYN`iDZZ9{qUHmtGD&)kqH-tG8@*+
zxu$c|W_2<YJdNZz-9!{V`JpSjBD8eoL)AP$-pQ7Y5M5KR?SEMOtzz(nF=^O9of1|$
z^N)VWwN^Csxn6PQ;DWO%0vp#dTfb*Kq%P!DeX#e@>^dz=vPR)K^(!ed>gTwFhfa~V
z=$%_=W#g`cdWkCs-F~CE^gchQq-@jLI8&KkwOKzq+ETPfh;0*T&A1#PlR+956!DW_
ze8{{T8LL2TxDplRpElC<HE0i%iPa0nX{xi!#mJPNA@%|*4Ql^_CO*P`OLo#?p9CXt
z{JSQ2=7vt)MN88@Nyk+*ZatHBpuY2+wON|%N)0OElco`c_0pC!#EX^E-hB&0uk`{T
zm#}9@I68m!vF43yF*=>mFuGaN-{%e<NLh*MU+S5e$6-n>Yn!67wwQZdL7lX=_a0Q2
zK9DjQSh*~-#w7Np3KBIZ<ocbHm2LyszS7kXoI^nGu~xZk#lxzE(YN3YCg9AmW_vEa
z8LLzT7@?|(vK95OtUbs%AESKFfc=vm&ul$nq8iuOG}tef0qG>`Ztp$idV={#%&fBJ
zkA^M~mbDmgGMMBkaEa`@A=7p9FFFsb*EzWaH#+WF6Pfy>f7jrjpUd{&h8fMgFyh+2
z1MkkK4t^T~#^eDjL(=f`@&<Gb#r;gJb&lifYgeu{6|<s;D7z5Ycb`s(>&|MVF?Z^f
zI#zJBZE=1qt8#!tKPIX}(@68#5GY~<R(68(x8ICS=`ir)uM1HX&YumP`trW*0yyav
zkkb_0fqxWTmy;=%gd_E~I1AjXIz7=K7Oj?cWYC$ukp=&8ot|M2a9T{S_$%hA3F4|(
zbb>QmL1_3F$hq@zZ`o4a5yxBPl7JD;GE|j0Qeh3wLO}XdTa&z~&)jD@ETXkfqjvU(
z8ED^imm><jNA~8JdI=A%x2KwCzfu6r{aCEOF}u>nkv!up&)Q5cT@$aeUa4CpbC@;S
zDq`t66$e3DQWi69O|gzbepIcS%ZVB}rUd#&Hg&UPla>g&T35YRv_0`g|2uTeN9Tyh
zhI^NRlT^ALA7OEDXo>SAQm=D(vO6Q`?<u;SSk+aR#vF&cph5kE{EJ;a2G_1=`{mDu
za4<Gcgov7zSE!=(fyLo#7cVGnCOc5HFF%nsKMoRX$NBZh+}~GVvoEtjR69$hL!BZ-
zlzZL8aCUVEErG&aUrMZIG?!sPGcTjVmJ@3(^>L4)@T+}8(2pLCBRko*srA|5*a{NA
zUnD!}j=%=k6&}De)u*h`^dAD)RzH7sSgJrT@nVW*Af=|f=S_2^v^^ie*x0ywxxuWB
zo=k1gaMT@<69JhInQ+D#trXy{Y}t8n@o{6_r<Im~<Lh~=l^X-*p#Pg=52Ns}8|!9i
z=&+mQ)DQm44a4WtWHg@n?%Y903L#666vl^dxr~hBEUnmsvtajoqF#@s-G|X{Xw-^Y
zCwfkI5|yuhD!|StnrlBjOd~ML<C&YdrFry5XM}lSgRYO0J;~KktUvL_O3f{^W|zeG
z{+GjQ8<cz{_Y(0`^hKAOx%8DYceQ?WOhw<=DDVa^kL&T<@XbcO(sta+xd&;;fJkmi
zmiS24_}Md^`EPEY>N}_Fb}Ucic7~%<MldJ-59D0VzQ%ByC_-oEBd=`zu&v88YD(F@
zjt{{vQh$n*S4eLhZ0-Hmw=-Y$bIxw8aV{WQb6YLAlNLeK4b4w0mZQ`=GcUNoDeaXT
zPV1XqT$Wy@AEngUAOY;$r<`h;$O|R?35jSG;ltTp**RW}^sFopI=n5zHt{cQ>-Tg+
zRkHI4L+|A-P_US8xh<_{Hsbak&&_ozmQt4{7Q=4eGS~5}E(ay68@0Aim_Ki!_O~yQ
za<mx=vmq+r*@?^1p@MmJ&S90#4i2Td;5E04sOdwVF}@`K%m=N4aDRy}NSt2fUj3r~
zi1ZkvP8M=c78#g!k)eGepR!PT+hv}nmT@;J;6x61u!n|!8)<B{XKk(D|Gu5DKMQG>
z<e#L#^?4;e)G%C|c{x4YCS_T1x}~TpeRRNm+NS4<#tI=y5WH^su)h~kzMAVfFe-Y-
zzFNL`CtDMiKc%2DZF8U6YL7{Ig}}=GC9=E4dQJ=Dt}XGvVWui-P%OEEp)bC4B*gy9
zpMG0Q=Pu`Pw7za9EIw@#@Hn}g*6%dh5Y?(>cHp^sjWjd;OTEHtR?SjIXEDr30{jpr
zUmms0s6(z#?6g~B&HtVqw*9*7^R><F>*lOUKjUD-u$UmA$pV_v>{n}X@!x}2-yn3>
zd=y%~=!bl;4|m&!Uwvz+>hH115Kk`It9@%OP^vmYm;^I=Jn^ytuRI}&UHpeDq*)T%
z=hxh#W3Eny?<NS#-Wu?Jc}=mp-2VwekSJ%Rc)g_geypbf>9HrLuTj*Ys&CF3Oz&@B
z3gY+(Ph6!$1&OD@E=$txfZ4%-B!%124m^l*`ZjO+h{eF+6vL{0c@0898H~K8&1VW;
z0)in=@lAE7EzoPvY(}8)9sY`75<X4yItl=8+fT0d3j$(6_#^KgOrolLA@~}|5>?*k
z6z>a-ig$>7*AMdpGXkpa9tyw@nePJ9W<#D^G^9dMH!2G`0a^XewY~)oX*vlQkifLd
zN5F#!(by&uj4TBrpg|(+jG$wR?@o7!AlccZy@LYgu3VyX9GHFY;hL_&!4)!~+s^8O
z*%r*ZfISeq4hGn0RijzcX=z}$ZQ=M~hy-{b&y$w%u7`}uc%%1lKQun`AT)7JJbjZO
zVTkCU^QeQL1i-N1<ZoaO&;1Sy+XL3*GI_S5Rei;OLeu`=NZv?qrTLR5P(uBOwz#L(
z2f<jW@>T%f!2^Bvi)FEcn2in#+RyPH_meV^AkIMSguD!qXVYH40}u&MesMtji29&G
z6vS*Cy)|Gz*~epCY*Mm9eR#Z646=UXE<{=65`SXqBmm+8@HjjIB$2=G5*W~PJ$dYk
zhf$d?RLm6^kGDB*LF0+@K0}zGw!FI$qz{kWIR^i4a;Jv~)tyJlAQ=#MWrmpC4>%1g
zO&;F^klC7m4;YCXBEUf^Z!tGC7UaQ5zb%MIA*sN%<3LzXyviVo3;}jI2|feCc*zXe
zLCA?a%MODi04E1W<A9&<yOp7mn8^@%SAN8#3B;tBkOqvw=H0WPL0k_XXt7+-3OqpQ
zhIR}wc?4p+en$WdIUQOF0)T+i@)cx*{FMOgSD!%!faU`f0+_?I;7g*QWqvY$1}-al
kXyENEDMAAIQ%E3gN}Te+XuBi~wL<)+nTe%wi6JrO-;Up%cmMzZ

literal 0
HcmV?d00001