From 2294aba9e39d8b2487da8fe66b3cd4d20818ea54 Mon Sep 17 00:00:00 2001 From: EvilMuffinHa Date: Mon, 25 May 2020 14:59:42 -0400 Subject: [PATCH] texturing works --- resources/textures/testimg.png | Bin 5785 -> 0 bytes resources/textures/thonk.png | Bin 0 -> 9190 bytes src/Test.java | 4 ++-- src/org/hl/engine/graphics/Vertex.java | 3 ++- src/org/hl/engine/io/Display.java | 6 +++++- src/resources/shaders/mainFragment.glsl | 6 +++--- src/resources/shaders/mainVertex.glsl | 10 +++++----- src/resources/textures/testimg.png | Bin 5785 -> 0 bytes 8 files changed, 17 insertions(+), 12 deletions(-) delete mode 100644 resources/textures/testimg.png create mode 100644 resources/textures/thonk.png delete mode 100644 src/resources/textures/testimg.png diff --git a/resources/textures/testimg.png b/resources/textures/testimg.png deleted file mode 100644 index ffe963ef4dd2c0a504e694b733c8f1f274fe07cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5785 zcmdsbXH*m2_jN+(5JC|UPy@J!kK;&zYHf@4B(quNi?^1z7I4Ar$(k7G-VC-~pZ0in`da`K(Nr>FB+|&Y!!V;*%-xYiL^M2H+AvPqupnIco>Jh; z3jZH6HiNyTvT zmw@)i4y}i#T1qem;y^PD0TE_!VY{vRr$74yR=M(s2t)p^(3}YQ{m{5$GW?rasGBB`eo=$`Okx$h}q$uF&-L4 zj^7-a|8($-{m$TcMimQ8nY?i5d`k6)DC`hv(SX$?8Z|_R4w7G6w8Yj&JGg{ zKI832m8h}JU;GL}N3YNAbxc8g{grq?vS>{EA4lp+>t1f?&(p?DGg;OwW3LPNuxZ{$ zRxw9%lyUPxO%g281w;pB32l~Lb_S{P~pfIqJAFm0`+E92_TCp zN^9CmSSbZuIw~tp|FRXA&k>paBT$R}2g#+-lH&;+#_gV}L7G1U_gToTU;}6eTYOkw zUf(Vs=}1UizsApiWzmTzMgws=Ot()VU48q>A3YT>0iTN8D@rwLTDG_?KuqpTJ(P?t5WhhhYkMfeztkJft4Y?OZ!vHE!%BG#=ZJZ{JG zmFVNZ#UGBSOEkTXZi<)XRG4Mhk#X`37tpE~pCb!3+0qOWaw(k!>6d?wqJ(i=185^! z3|BPWG|EAcWO)0s-T{b&aCO;=ob$NfThrid& zg%oIT!ozvXn&o+lAaf=6qUsfcEFZ4OdDwHDgPr1>-QheHZ9+huT_n0zJM&3^YLbT& zb-7wH{SMC;+~koB_c<&XwvKPLqOOuk{B|}`;$?ueuEunScZ?R!U4-boMzE-W4Lu=V zx%(R#H*hgJ2ynCL_gn%svztM<+6tsDU_8mP@<304XU?-}Y5|nb(V*CPN?XgclbUD< zG>#VsNoj-;8-N4RZ&#JiIWp;-_H^-5d*YQANiBFq$E>oA9QKP}r(YY0US66(*K)L; zMLp9@L=D1PG`32-si(JqC)Q=WBOc3MMsmk1Y7GA0)Bs-&c@ndB&>2pz~ zR_L;f9Ch{b{@$CCLturw@-E~OC7>!t@wr<%?B**!LsD(KhbnnDcq|vpc8OE8S3aMR z=tLbp-F|Lzv!y9CnOx-5bXGr*M2KD3l)?Xr!hmdS9IJ9_7l~4L&wMMpuhH$?70ch- zyCidXg;zdBA$a2jMv0tb3Z=>(29!V#UwCdV%7xE9kBOo3HXs^KX+t#T}pESNU!YZZ5ElZnY$8$WPNyOCxjgf*>;GBJZ61)@+q+{9h?%nxC8Ke+ee zy7H2G+L4ErH35)3hH-5_1B8vvE*t5>zxbUDqVjpuJ*|V1`A%vfeM@V%Fx$h{meBbZ za?=;xUr6|8=IqUc9#~S#`uQ8Z{UAh!RS*Qg>0vJramJo#%RnLe0WjtyM$!o#K@?`GF5Yw*NMS>R^5yxDEUBLui{2mB4H zI1cJ0GqHOJYxcM7&6u11KspSv$wvGfF7x3Z1$ZVW3O4;#4dwe_Rqby7m7=YWkFS<{ z5Ek^!Dmbuj&3~e7Fng?`B6Q08D1gV-yo82;Jk!`{OUWVKL=c`}4av3P#3aurFuqQ~ z(l*z#7Nm!kc{7w0aWDPp=iyaa(mvm9vijSC1$ZGI4fjDuw?v)f=)Jq27JF`oU2obC zQoR=y`}54$=(Hp=zRTk3^+{*UCfM%wkTqC(22uvx>==-`tjhDV^_kvgJ(y=)tF)x~ z24@44QH|o^8#Dgc*?N`JW9VP*+V4ql^nPFc)9PWA#ypgl1G#1cJ!k`YM^nvXW<1zj z0?k(NUJMN}Y`ct0JfKn_%Ou_^1!$`)S~)UBGV196Xre5!Xt9v;i{B^J_0Y=rvNrFe zoIi2Y=ftagl;gyi53y<={I%IoHL)2~x_7o?l!UG|mL5IJAUZ<+>`QnUhhf*MH`k6g zJAS*siqUkrme?a$BNO3e36J9W5hsWSw_Ev=L{_foGOE(&2zBjhzEnVO-(5;}9KP5G znHCSPb$k#6iLtc3@sgs)1S8nIsMlTYuF^u;X*|?c!=V?ufG!_9oqZ=Pa}EX?+M8w< zH*)sY$22Rz>Z;M}??s#GGENC?uqxT@v&&H7^i3_N#&j}AdWS{8R@(Z4 zRZp^NC^~&rOiHkGxZ!V{6S*PRLH!9FZZw_|^y2i$&5Dwuw<1+JpiAna%0o`DeBf6X zV^CU<>1d%O0Ww(^DF zcU-ZS(+Zj=S+(wU271j&>#iYnHsLRkb7h$;#H5k3s{`R`L$zX_E|S@N68%gKr?=bd z9e8O->%`yuy|WC1fwGz@Ws~%-r1q zni#@H@wilTBs+4><#EyYUX(p1#gn8gil4g+wweKE{_f;A+3{Y12xC0Z9Q}3}J%X0f zMa~gs{y^bV+fB61(O@lHM`avvnkFzxwEA}C)+0WSNM}E;NcND<+JN69ime!J7AFLF zs6fDzC*u<58tE*v$&OEx+%Q=l!kn<;aZMuZm^iL8Eb(pFfNXf;?+eJm@u3=cq|uIY zNwQ9ibCsE4(!(T#Ae0)98k!-MH1!6_m)e_4Y8F>x9CWNI_2psn<7o%kT;!6)6#G$f$RmF*7 zcY>G>G3r-?d}IX1BY&b{uK- zU8dD{_MZ{~u+=pwca&-=x`HPB%W>|4ph&I9d+S+~FY_+;<8u8el1Jeto)B{n7PQidp}9qJ0LEC$ zlv0A59q{xNRwYUa=ha;zd82C-OLzRqSa^65C*^?VHwuq`YucQ%;|9Vn9549rA3q@T zwJFA`)C1}f4iHKM#}XIPpMmjPE|O8=^3>!Ok)ijSOapt6YZ{JQZ@CCPl7g@Nw1!H+ zp2_aVouCte)AE`zh27g6Rs5;cstS;2Hr7q;FPRfK9KEjLh# zDCm@!ql=&1kgR=SUJvawTok^H8?--JpZEkLAkoT+E3~~?6MIGIKlkJLuVU$h*WM#3 zNkel^!c#6#q=jPBuGB@Q#|>fYo>BVLSU8$P85^O;)wvDV*lfKA9S7y$v4Odr1?^61 znr~k*YWu&Y%J1_Ar?KuFraPgM6#*RnULd@{o0A9p({*_2!kRMa1h4Cc${-SWjP%;g zxvx1jUwCOpE-7!BtH3p}1FXBOQk9eXu!oPf^19R-EKoyVAs(>cblxBDc%6LohuXoO zE@Ca;+Z|RQb}D^>83x^&kB7E9a`4Kr7<777*!q)|ahu+2I+u5ep2|3^(&L@&PwSZ5 zl>VPtAI-3)6WBm)?S|nJ@7Bs@2k_02d6-a;R*}GW&X!0TvEJ`nMZ4oR)r?o}w`~f^ zKFDj^<};gJn!Dv`r@{2nh~ikqC_d}~MeaRI@HkLms&oM15pt`gD0UpSX*)Mqzndca z0CqS&JF@eT!}c>{!*Z@Ijt?;gbZ2VA&>V>nNKlmBw|hnlUXBLyb;vQ-eO* zQ4VFVq)j5*GA%Pax$ZBN?Sd9-M~Y17Y`@Z2GMrvTuP?zDZ9s(jJaG&)F@>)s8|*oF zq3ay%TRx-T2ZV6Tt|iYnYfG8{ZM1bwx5m=%L~cDV4t-V4!dwxOCjPd!J`Z5~mAzrv zf|U29K8Nz6C2pXhwhU;7+iMFAeCQqO_@`g)*GR>QzZ|cl?`Vyki-0~SjANCJ^3um5 zofs;Akz~@}RkcJr2w=(b5$pRr1ECs6=56_mbCbDhdviiT6v}SdU0Xsw=#Fvm5#G_m z?h)-U$XOjjPGj-NM`?t~NSt|?v}HJg*9Dj0;S#btr)EV3TMOHKV5E;UGTjpH`@9;4)nC4)G4WlRINlp!!D0;<@f3q~jax=kM&ftVr+-RL!gJ`$ldd%F zBlrW~Lo+_~qISOti4EG>qgv|b8|wk5_7QX5o(AOdr3NtRE2Zwwkku}eK5Cyw+!d00u*X)h4_V*jkeAV-&sh)q9QP{d{$Q2Q)AI_oNC6!qp3tMWd)OpF_47%*Z=dX% zO3Q>vReBmaX}KfBzoe1LC?M` zAh_HuaZm4+>xPc3BAk`JH#w#57@Fa7b%7sUy(9SD#3PVv7Oe`jqowTKFX(-<^JUz$ zGq1wvX5`ELnLNQPUm#~c9~-)+n=b!dH9*os8t_H%|0~mRR+~%(vI0KFqh}I&XvfI_ N6T@o;6?%5z{|D3YR%`$O diff --git a/resources/textures/thonk.png b/resources/textures/thonk.png new file mode 100644 index 0000000000000000000000000000000000000000..a166634cce2f2d44dd1e295d339cc4b9887e31b7 GIT binary patch literal 9190 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 wTn76R%4M)GpLkHvj+t07*qoM6N<$f*x=I)&Kwi literal 0 HcmV?d00001 diff --git a/src/Test.java b/src/Test.java index 45cb36a..71cfeb3 100644 --- a/src/Test.java +++ b/src/Test.java @@ -24,7 +24,7 @@ public class Test { 0, 1, 2, 0, 2, 3 - }, new Material(new Texture("resources/textures/testimg.png"))); + }, new Material(new Texture("resources/textures/thonk.png"))); public void run() throws Exception { setup(); @@ -49,7 +49,7 @@ public class Test { display.create(); shader = new Shader("/resources/shaders/mainVertex.glsl", "/resources/shaders/mainFragment.glsl"); renderer = new Renderer(shader); - display.setBackgroundColor(1F, 0, 0); + display.setBackgroundColor(1F, 1F, 1F); mesh.create(); shader.create(); diff --git a/src/org/hl/engine/graphics/Vertex.java b/src/org/hl/engine/graphics/Vertex.java index 3270b27..99a58d7 100644 --- a/src/org/hl/engine/graphics/Vertex.java +++ b/src/org/hl/engine/graphics/Vertex.java @@ -10,9 +10,10 @@ public class Vertex { private Vector3f color; private Vector2f textureCoords; - public Vertex (Vector3f position, Vector3f color, Vector2f texture) { + public Vertex (Vector3f position, Vector3f color, Vector2f textureCoords) { this.position = position; this.color = color; + this.textureCoords = textureCoords; } public Vector3f getPosition() { diff --git a/src/org/hl/engine/io/Display.java b/src/org/hl/engine/io/Display.java index 47c94bc..5303606 100644 --- a/src/org/hl/engine/io/Display.java +++ b/src/org/hl/engine/io/Display.java @@ -1,5 +1,6 @@ package org.hl.engine.io; import org.hl.engine.math.lalg.Vector3f; +import org.lwjgl.glfw.GLFWErrorCallback; import org.lwjgl.glfw.GLFWVidMode; import org.lwjgl.glfw.GLFWWindowSizeCallback; import org.lwjgl.opengl.GL; @@ -96,6 +97,8 @@ public class Display { // Creates the window (should go in the init() function of your Main program) public void create() throws Exception { + GLFWErrorCallback.createPrint(System.err).set(); + // initializing glfw if (!glfwInit()) { //System.err.println("Failed to initialize GLFW! "); @@ -104,7 +107,7 @@ public class Display { } glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4); - glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 6); + glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 1); glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL11.GL_TRUE); glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); @@ -190,6 +193,7 @@ public class Display { // Completely DESTROYS the window public void destroy() { resizeCallback.free(); + glfwSetErrorCallback(null).free(); glfwDestroyWindow(window); glfwTerminate(); } diff --git a/src/resources/shaders/mainFragment.glsl b/src/resources/shaders/mainFragment.glsl index 3f034ff..9ad7039 100644 --- a/src/resources/shaders/mainFragment.glsl +++ b/src/resources/shaders/mainFragment.glsl @@ -1,9 +1,9 @@ #version 410 core -in vec3 passColor; -in vec2 passTextureCoord; +layout(location = 0) in vec3 passColor; +layout(location = 1) in vec2 passTextureCoord; -out vec4 outColor; +layout(location = 0) out vec4 outColor; uniform sampler2D tex; diff --git a/src/resources/shaders/mainVertex.glsl b/src/resources/shaders/mainVertex.glsl index 172bf89..3544e06 100644 --- a/src/resources/shaders/mainVertex.glsl +++ b/src/resources/shaders/mainVertex.glsl @@ -1,11 +1,11 @@ #version 410 core -in vec3 position; -in vec3 color; -in vec2 textureCoord; +layout(location = 0) in vec3 position; +layout(location = 1) in vec3 color; +layout(location = 2) in vec2 textureCoord; -out vec3 passColor; -out vec2 passTextureCoord; +layout(location = 0) out vec3 passColor; +layout(location = 1) out vec2 passTextureCoord; void main() { gl_Position = vec4(position, 1.0); diff --git a/src/resources/textures/testimg.png b/src/resources/textures/testimg.png deleted file mode 100644 index ffe963ef4dd2c0a504e694b733c8f1f274fe07cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5785 zcmdsbXH*m2_jN+(5JC|UPy@J!kK;&zYHf@4B(quNi?^1z7I4Ar$(k7G-VC-~pZ0in`da`K(Nr>FB+|&Y!!V;*%-xYiL^M2H+AvPqupnIco>Jh; z3jZH6HiNyTvT zmw@)i4y}i#T1qem;y^PD0TE_!VY{vRr$74yR=M(s2t)p^(3}YQ{m{5$GW?rasGBB`eo=$`Okx$h}q$uF&-L4 zj^7-a|8($-{m$TcMimQ8nY?i5d`k6)DC`hv(SX$?8Z|_R4w7G6w8Yj&JGg{ zKI832m8h}JU;GL}N3YNAbxc8g{grq?vS>{EA4lp+>t1f?&(p?DGg;OwW3LPNuxZ{$ zRxw9%lyUPxO%g281w;pB32l~Lb_S{P~pfIqJAFm0`+E92_TCp zN^9CmSSbZuIw~tp|FRXA&k>paBT$R}2g#+-lH&;+#_gV}L7G1U_gToTU;}6eTYOkw zUf(Vs=}1UizsApiWzmTzMgws=Ot()VU48q>A3YT>0iTN8D@rwLTDG_?KuqpTJ(P?t5WhhhYkMfeztkJft4Y?OZ!vHE!%BG#=ZJZ{JG zmFVNZ#UGBSOEkTXZi<)XRG4Mhk#X`37tpE~pCb!3+0qOWaw(k!>6d?wqJ(i=185^! z3|BPWG|EAcWO)0s-T{b&aCO;=ob$NfThrid& zg%oIT!ozvXn&o+lAaf=6qUsfcEFZ4OdDwHDgPr1>-QheHZ9+huT_n0zJM&3^YLbT& zb-7wH{SMC;+~koB_c<&XwvKPLqOOuk{B|}`;$?ueuEunScZ?R!U4-boMzE-W4Lu=V zx%(R#H*hgJ2ynCL_gn%svztM<+6tsDU_8mP@<304XU?-}Y5|nb(V*CPN?XgclbUD< zG>#VsNoj-;8-N4RZ&#JiIWp;-_H^-5d*YQANiBFq$E>oA9QKP}r(YY0US66(*K)L; zMLp9@L=D1PG`32-si(JqC)Q=WBOc3MMsmk1Y7GA0)Bs-&c@ndB&>2pz~ zR_L;f9Ch{b{@$CCLturw@-E~OC7>!t@wr<%?B**!LsD(KhbnnDcq|vpc8OE8S3aMR z=tLbp-F|Lzv!y9CnOx-5bXGr*M2KD3l)?Xr!hmdS9IJ9_7l~4L&wMMpuhH$?70ch- zyCidXg;zdBA$a2jMv0tb3Z=>(29!V#UwCdV%7xE9kBOo3HXs^KX+t#T}pESNU!YZZ5ElZnY$8$WPNyOCxjgf*>;GBJZ61)@+q+{9h?%nxC8Ke+ee zy7H2G+L4ErH35)3hH-5_1B8vvE*t5>zxbUDqVjpuJ*|V1`A%vfeM@V%Fx$h{meBbZ za?=;xUr6|8=IqUc9#~S#`uQ8Z{UAh!RS*Qg>0vJramJo#%RnLe0WjtyM$!o#K@?`GF5Yw*NMS>R^5yxDEUBLui{2mB4H zI1cJ0GqHOJYxcM7&6u11KspSv$wvGfF7x3Z1$ZVW3O4;#4dwe_Rqby7m7=YWkFS<{ z5Ek^!Dmbuj&3~e7Fng?`B6Q08D1gV-yo82;Jk!`{OUWVKL=c`}4av3P#3aurFuqQ~ z(l*z#7Nm!kc{7w0aWDPp=iyaa(mvm9vijSC1$ZGI4fjDuw?v)f=)Jq27JF`oU2obC zQoR=y`}54$=(Hp=zRTk3^+{*UCfM%wkTqC(22uvx>==-`tjhDV^_kvgJ(y=)tF)x~ z24@44QH|o^8#Dgc*?N`JW9VP*+V4ql^nPFc)9PWA#ypgl1G#1cJ!k`YM^nvXW<1zj z0?k(NUJMN}Y`ct0JfKn_%Ou_^1!$`)S~)UBGV196Xre5!Xt9v;i{B^J_0Y=rvNrFe zoIi2Y=ftagl;gyi53y<={I%IoHL)2~x_7o?l!UG|mL5IJAUZ<+>`QnUhhf*MH`k6g zJAS*siqUkrme?a$BNO3e36J9W5hsWSw_Ev=L{_foGOE(&2zBjhzEnVO-(5;}9KP5G znHCSPb$k#6iLtc3@sgs)1S8nIsMlTYuF^u;X*|?c!=V?ufG!_9oqZ=Pa}EX?+M8w< zH*)sY$22Rz>Z;M}??s#GGENC?uqxT@v&&H7^i3_N#&j}AdWS{8R@(Z4 zRZp^NC^~&rOiHkGxZ!V{6S*PRLH!9FZZw_|^y2i$&5Dwuw<1+JpiAna%0o`DeBf6X zV^CU<>1d%O0Ww(^DF zcU-ZS(+Zj=S+(wU271j&>#iYnHsLRkb7h$;#H5k3s{`R`L$zX_E|S@N68%gKr?=bd z9e8O->%`yuy|WC1fwGz@Ws~%-r1q zni#@H@wilTBs+4><#EyYUX(p1#gn8gil4g+wweKE{_f;A+3{Y12xC0Z9Q}3}J%X0f zMa~gs{y^bV+fB61(O@lHM`avvnkFzxwEA}C)+0WSNM}E;NcND<+JN69ime!J7AFLF zs6fDzC*u<58tE*v$&OEx+%Q=l!kn<;aZMuZm^iL8Eb(pFfNXf;?+eJm@u3=cq|uIY zNwQ9ibCsE4(!(T#Ae0)98k!-MH1!6_m)e_4Y8F>x9CWNI_2psn<7o%kT;!6)6#G$f$RmF*7 zcY>G>G3r-?d}IX1BY&b{uK- zU8dD{_MZ{~u+=pwca&-=x`HPB%W>|4ph&I9d+S+~FY_+;<8u8el1Jeto)B{n7PQidp}9qJ0LEC$ zlv0A59q{xNRwYUa=ha;zd82C-OLzRqSa^65C*^?VHwuq`YucQ%;|9Vn9549rA3q@T zwJFA`)C1}f4iHKM#}XIPpMmjPE|O8=^3>!Ok)ijSOapt6YZ{JQZ@CCPl7g@Nw1!H+ zp2_aVouCte)AE`zh27g6Rs5;cstS;2Hr7q;FPRfK9KEjLh# zDCm@!ql=&1kgR=SUJvawTok^H8?--JpZEkLAkoT+E3~~?6MIGIKlkJLuVU$h*WM#3 zNkel^!c#6#q=jPBuGB@Q#|>fYo>BVLSU8$P85^O;)wvDV*lfKA9S7y$v4Odr1?^61 znr~k*YWu&Y%J1_Ar?KuFraPgM6#*RnULd@{o0A9p({*_2!kRMa1h4Cc${-SWjP%;g zxvx1jUwCOpE-7!BtH3p}1FXBOQk9eXu!oPf^19R-EKoyVAs(>cblxBDc%6LohuXoO zE@Ca;+Z|RQb}D^>83x^&kB7E9a`4Kr7<777*!q)|ahu+2I+u5ep2|3^(&L@&PwSZ5 zl>VPtAI-3)6WBm)?S|nJ@7Bs@2k_02d6-a;R*}GW&X!0TvEJ`nMZ4oR)r?o}w`~f^ zKFDj^<};gJn!Dv`r@{2nh~ikqC_d}~MeaRI@HkLms&oM15pt`gD0UpSX*)Mqzndca z0CqS&JF@eT!}c>{!*Z@Ijt?;gbZ2VA&>V>nNKlmBw|hnlUXBLyb;vQ-eO* zQ4VFVq)j5*GA%Pax$ZBN?Sd9-M~Y17Y`@Z2GMrvTuP?zDZ9s(jJaG&)F@>)s8|*oF zq3ay%TRx-T2ZV6Tt|iYnYfG8{ZM1bwx5m=%L~cDV4t-V4!dwxOCjPd!J`Z5~mAzrv zf|U29K8Nz6C2pXhwhU;7+iMFAeCQqO_@`g)*GR>QzZ|cl?`Vyki-0~SjANCJ^3um5 zofs;Akz~@}RkcJr2w=(b5$pRr1ECs6=56_mbCbDhdviiT6v}SdU0Xsw=#Fvm5#G_m z?h)-U$XOjjPGj-NM`?t~NSt|?v}HJg*9Dj0;S#btr)EV3TMOHKV5E;UGTjpH`@9;4)nC4)G4WlRINlp!!D0;<@f3q~jax=kM&ftVr+-RL!gJ`$ldd%F zBlrW~Lo+_~qISOti4EG>qgv|b8|wk5_7QX5o(AOdr3NtRE2Zwwkku}eK5Cyw+!d00u*X)h4_V*jkeAV-&sh)q9QP{d{$Q2Q)AI_oNC6!qp3tMWd)OpF_47%*Z=dX% zO3Q>vReBmaX}KfBzoe1LC?M` zAh_HuaZm4+>xPc3BAk`JH#w#57@Fa7b%7sUy(9SD#3PVv7Oe`jqowTKFX(-<^JUz$ zGq1wvX5`ELnLNQPUm#~c9~-)+n=b!dH9*os8t_H%|0~mRR+~%(vI0KFqh}I&XvfI_ N6T@o;6?%5z{|D3YR%`$O