From 6719c57ba8c30b5db3dba0697fadfe0ca62e8afd Mon Sep 17 00:00:00 2001 From: Spencer Vaughn Date: Wed, 22 Feb 2023 18:22:42 -0600 Subject: [PATCH] switch-examples: Updated Makefile for romfs and updated all audio examples for switch --- .gitignore | 3 ++ examples-switch/Makefile | 7 +++- examples-switch/audio/audio_module_playing.c | 11 ++++--- .../audio/audio_module_playing.png | Bin 47970 -> 0 bytes .../audio/audio_multichannel_sound.c | 16 ++++++---- .../audio/audio_multichannel_sound.png | Bin 16088 -> 0 bytes examples-switch/audio/audio_music_stream.c | 22 +++++++------ examples-switch/audio/audio_music_stream.png | Bin 15043 -> 0 bytes examples-switch/audio/audio_raw_stream.c | 22 +++++++++---- examples-switch/audio/audio_raw_stream.png | Bin 16736 -> 0 bytes examples-switch/audio/audio_sound_loading.c | 16 ++++++---- examples-switch/audio/audio_sound_loading.png | Bin 15438 -> 0 bytes examples-switch/audio/audio_stream_effects.c | 30 ++++++++++-------- .../audio/audio_stream_effects.png | Bin 16323 -> 0 bytes .../{audio => romfs}/resources/LICENSE.md | 0 .../{audio => romfs}/resources/coin.wav | Bin .../{audio => romfs}/resources/country.mp3 | Bin .../{audio => romfs}/resources/mini1111.xm | Bin .../{audio => romfs}/resources/sound.wav | Bin .../{audio => romfs}/resources/spring.wav | Bin .../{audio => romfs}/resources/target.flac | Bin .../{audio => romfs}/resources/target.ogg | Bin .../{audio => romfs}/resources/weird.wav | Bin .../textures/textures_image_drawing.c | 9 ++++-- 24 files changed, 86 insertions(+), 50 deletions(-) delete mode 100644 examples-switch/audio/audio_module_playing.png delete mode 100644 examples-switch/audio/audio_multichannel_sound.png delete mode 100644 examples-switch/audio/audio_music_stream.png delete mode 100644 examples-switch/audio/audio_raw_stream.png delete mode 100644 examples-switch/audio/audio_sound_loading.png delete mode 100644 examples-switch/audio/audio_stream_effects.png rename examples-switch/{audio => romfs}/resources/LICENSE.md (100%) rename examples-switch/{audio => romfs}/resources/coin.wav (100%) rename examples-switch/{audio => romfs}/resources/country.mp3 (100%) rename examples-switch/{audio => romfs}/resources/mini1111.xm (100%) rename examples-switch/{audio => romfs}/resources/sound.wav (100%) rename examples-switch/{audio => romfs}/resources/spring.wav (100%) rename examples-switch/{audio => romfs}/resources/target.flac (100%) rename examples-switch/{audio => romfs}/resources/target.ogg (100%) rename examples-switch/{audio => romfs}/resources/weird.wav (100%) diff --git a/.gitignore b/.gitignore index ef3f437a4..e1d3d9503 100644 --- a/.gitignore +++ b/.gitignore @@ -76,6 +76,9 @@ examples-switch/*/*.lst examples-switch/*/*.map examples-switch/*/*.nacp examples-switch/*/*.nro +projects/switch-nx/*.elf +projects/switch-nx/*.nacp +projects/switch-nx/*.nro # Ignore files build by xcode *.mode*v* diff --git a/examples-switch/Makefile b/examples-switch/Makefile index dce06e9b8..0d5f70a53 100644 --- a/examples-switch/Makefile +++ b/examples-switch/Makefile @@ -51,6 +51,11 @@ USE_EXTERNAL_GLFW ?= FALSE # NOTE: This variable is only used for PLATFORM_OS: LINUX USE_WAYLAND_DISPLAY ?= FALSE +# Define romfs folder location relative to Makefile +ifeq ($(PLATFORM),PLATFORM_NX) + ROMFS := romfs +endif + # Use cross-compiler for PLATFORM_RPI ifeq ($(PLATFORM),PLATFORM_RPI) USE_RPI_CROSS_COMPILER ?= FALSE @@ -561,7 +566,7 @@ else ifeq ($(PLATFORM),PLATFORM_NX) $(CXX) $@.o $(LDFLAGS) $(LDLIBS) -o $@.elf -D$(PLATFORM) $(NM) -CSn $@.elf > $@.lst nacptool --create "$(notdir $@)" "Raylib Example" "1.0.0" $@.nacp - elf2nro $@.elf $@.nro --icon=textures/resources/raylib_logo.jpg --nacp=$@.nacp + elf2nro $@.elf $@.nro --icon=textures/resources/raylib_logo.jpg --nacp=$@.nacp --romfsdir=$(CURDIR)/$(ROMFS) else $(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) endif diff --git a/examples-switch/audio/audio_module_playing.c b/examples-switch/audio/audio_module_playing.c index 87dd0125d..a8c10fc6e 100644 --- a/examples-switch/audio/audio_module_playing.c +++ b/examples-switch/audio/audio_module_playing.c @@ -34,6 +34,7 @@ int main(void) const int screenWidth = 1280; const int screenHeight = 720; + // Initialize resource directory romfsInit(); SetConfigFlags(FLAG_MSAA_4X_HINT); // NOTE: Try to enable MSAA 4X @@ -58,7 +59,7 @@ int main(void) circles[i].color = colors[GetRandomValue(0, 13)]; } - Music music = LoadMusicStream("resources/mini1111.xm"); + Music music = LoadMusicStream("romfs:/resources/mini1111.xm"); music.looping = false; float pitch = 1.0f; @@ -78,14 +79,14 @@ int main(void) UpdateMusicStream(music); // Update music buffer with new stream data // Restart music playing (stop and play) - if (IsKeyPressed(KEY_SPACE)) + if (IsGamepadButtonPressed(0, GAMEPAD_BUTTON_RIGHT_FACE_LEFT)) { StopMusicStream(music); PlayMusicStream(music); } // Pause/Resume music playing - if (IsKeyPressed(KEY_P)) + if (IsGamepadButtonPressed(0, GAMEPAD_BUTTON_RIGHT_FACE_RIGHT)) { pause = !pause; @@ -93,8 +94,8 @@ int main(void) else ResumeMusicStream(music); } - if (IsKeyDown(KEY_DOWN)) pitch -= 0.01f; - else if (IsKeyDown(KEY_UP)) pitch += 0.01f; + if (IsGamepadButtonPressed(0, GAMEPAD_BUTTON_RIGHT_FACE_DOWN)) pitch -= 0.01f; + else if (IsGamepadButtonPressed(0, GAMEPAD_BUTTON_RIGHT_FACE_UP)) pitch += 0.01f; SetMusicPitch(music, pitch); diff --git a/examples-switch/audio/audio_module_playing.png b/examples-switch/audio/audio_module_playing.png deleted file mode 100644 index 8bde9879d4aa7c8f57c9bb334888b0fd52c1102e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 47970 zcmeAS@N?(olHy`uVBq!ia0y~yU{+vYU_8XZ#=yWJp1k%11H*1jPZ!6Kin!!I{46|+ z6HHj#oWVpxmlX|6ProHIwpshLtdz1_EIaYy6Ei8M#fk=C z;*xX17G|Sa>=1j)I2zJy93*r_{NkoAskp`*en99dCu64ETtUgRb75Mfm<}7TxLGSK zK3N5}`AOS>xeQaDhHYqAkoufCtzF;gXiz^VcrQEA`32nQ}!G`QlFP{NjCa#o0^@&5I^Ls$RoD`P(6Cf4k^DQo58 z8An$wWqh`{yPxf61_w_B$Aioxmy-@#Zv3ZG<I5!K(pe;9c#Bi=tP8?X z&K8hRo6cx9`(y4|H?|yO=`9>e>jdmKY+MjI=_23B45cNN90D(Dc%HmrKl5JYEjweT z)Z3Pxv^f_ABzPOagrXGFV%Z6Tb4ncN@>Z2u6|kD-l(lFdso$a?$;=XW}X6kdqT&`kclY4#9#rT5ahyS`aSpWaO?^b-$S|Of8>6ix3GD*o$_s7{_6HQp$ zO2Dxi@TED;df(ccCMq>Hw*)11XRZ`t5o zv!pG>M9JMb!KH;^&Emqhw#>{uzN?OJWl^+pm^<+z-^mGHW{YJfB+fa_{y9iHs7ZE< zJIfZG?2^sDGM4(3a0uM|DdBT^eL|h`YG$TOHoN3o^dwnq9ye}0)8!S`f3BlPtVmgr zWgVmSy9Ivix_`J{O~~NvUA9Z)$j%9j(ccqa!+@5(@vYC z=JOl0dh*A!q{obb9vruqo`w#PS=P$iyt`!6$x9Eja~>{dckwTK=W?f<4M{z zfyP$SMp3%Syp0oWelv1UxELw0DwXfaIrbIB7pq;Qa?IBCvFUXS%8J?Tm=ve6`o=TP z8KFs^MS`sh)}O3j@ZyEfiHu6~Cr%7kJ}Q(aTk6_y-!3-VWuJ0EW$8u935fygdbgZo zFPhSOuB9jJjE17ap*QRv_cz>TX5#L-m|UrOPU5)SzchJ&@0`}0=Hjqf z<;C2I7i|?6KfN=7v#~L%$kmJCrnjL%&%7C?4?MHBFdH2?y>;T9pAD{eGt^VI6tT54 zOjM6oY`?bQZ9~tz4%f0}7T-STJD-0zpXaz-t^9=^)>)E{B`z%z5;Jw&jDKZt@Vpa{ z@bO;9(Ru}>pV=sC-UNB3#dG;xZuFKpxfKgBcW#znAW;3ivzc)Ve~Lk?oa^!g#p;w2 zv6dwnt|d1An7$tTa9}yl4IDy(*nKnyGnpCBwA8|HW@aGM0OZNSt`t)1!A#s_E&CjOWbdOF&U@p=)N()9?)w zq+>@(ZkQJJRpwvovb+yx>Jq9NCN4ZOO}gWzq}#y^4xTOniB)s? zpB#{GoIBzF|Ax8jPj2#Msi?WJPqI>4Y^>nChDZ8s&4Ye}3qBmHr?DM=vG%3%nxbV1 zY%U$|t(h}4uO)C8PKb7!9lC{|@k}ItiuHfKM;br)@67+i{AQof?S(fvcYgoLdF?~! zqp6axG>_&xa#+uNi~QW~AFE1!x|EdiVg=qX-B-^X-ka=xn0vI^K|ia zp+zYT3smnnERTLT`{55$79*ZT%uGdZ5?;16SV@*QZkGPOV8$#)&esz(nA1Jo(!JO` zg=GEa@<&YIySy~QWbRjmDKZ~RT->Y`oR`#^-TJ9uyU6W(bI*i#;-Xdx&52?yuQtms zcp-n6o#{MFi?zJM(*127%NW8OB?A=!RYT=^d!Hw$3-cuvwUCQ+L+)x`ggDt+ulPKCVkj z?f&up>~T8n$C1$~x?-dM`K4h;+)iY;xAb|6oBTGsBdv0HVYBO7<+7E6&lSuS@0uHd z?2+UwJ1BQpL&2KG?Qns~#|c7AUtYBYd_C8HQR5g#<3r2OjuwkDFLE-THE2k)W2-h| zE_HEBcg~RUK3w^YS**mlhV6;{EuX^)r?#IkU)x{iz*g94WmV+A_k<+x>5F1onu-js zS{kOgUDUebW-Y(Pw|~LnGDqIROF2L7bBs8*S}88L$ro@u`Mf~XBNHoWr^6{WLTUC1 z2hCmnTD_PSw@}^vLg9f6e3vrVQv|{-7b}0i(mm(m2AO5D0$h3uDk4e?mIiKl(b8~+ zrL^FMn6e4a;)63*eYpR*@%+&qXN}1M?{pfi6c=nzxE{PAvj56b8xUevhucVuQzPSt5r93U^~niex>8cML!PF&4&zb%kRgk31Oj&mA_r-pK;Oeu0hW9j}e!T2A_}>3^H5UeC1G@&5OMUW#tS?xE3Fr zuuDVoqx`zPVnK&fc9hs9e6+m9xiILIT&L`Wg<%>ztvC52W-#47b;y8=EtaFlY)YoE z>Hr_!TO{Oo8NHktN;R*xUu2LyAi$t&%%p3+=nUr>hqv`@sWwfA zj(PR99`u?gx%_`y_H*WE4=?(0w0c&ny#3$6dUe9AuayQ*POZDB8qutCDq-=L#cL&R zwH(O!!FPBH>#n!eCWjOF8wG{Tj?4X(Ow??cnezWpbeHKJYxxs%Cp6kD`~J26JI{%V z6DqeR?)j6o;>X|r7hX5?oNM6OB=q3>R_VpQE5Yqs5W%SA+)(Ac-r;fKg0px3x2N7{ zo|e>@)^#D>(aq~Qv)IZ7GX+xPB-vCImbtn#TS+Jsudm&~Z6Z2v8r~W&tZb6aZQ*~%_4)sWIgFBT8+cano$zf7beJz7F*jGrH}kL^OWV&g0&n$X zSwg#;HwrTq374*V(`w$=E5>j^Kw+7%k%X1p4JDpSk~^)XrY}}BPysjhZ!t6 zY;jT(5uoezC9L(w^Ewh7&7cR)*WCtThfpw z#a48zIl$#&ty#*Fr80qi7xy?V2FKB)C8oC&mesrTwEZ;D3U~kBnBexzfM57RkkYMX z4-T4eJMDctYyS;DW1GKU>bC^8iZIF#A>J*EH6_`!zCUoY=xoMh)^eDc>|!(O=;v-h<- zB^*q1X8YW8He=CZM-Brmo|6f(ZyR_fWk}x@v5nH{ZDVLvG`PhmX(%i3>#1nK<9da3 zrxn@u8Q+-2%9hLjm(?wr;KZ;+g!|f0iC4T8tMaGFpZuQCbC1z!b5YV3W}_&U{u=@k zZ@=&!ULkMG+ufMRQgS4t_?PIqKL!DF1zz3ep8Z#1?KcDGgvX1Sd7Lv(iY~N}d2xA{ z+vOV>90FX87x_+PNJ)ZwnRbc>R@_E!tQEH0t?64Y?6f|6v%~EBj%9)6&z|akHWoSG z_^q)=?{E{#$?f*`2j=!qzki=^^{s}ixf3o*PH>#7Cm|`@ma+Rq7|7fiH z`=MR_@K+`s`GZMKYvkQ$UuAJhC=vc;;G?vl_xgg!3Hr)kW?U4!z-ayL#d!wRmss8877p)k*IU20w`}gl-INe~S@MzAV!&-A3<_c7E3bO_BIiC8% z`l@BmKf6trCQN&9;lq1@yUd_^QspG~UPGQ&ISp14@9Vh@5?*Iac$5>c+-1U7X66>T zw=;UK9Xf2o;?VoSx>4D9mV0``3xW3=l&c)oJp;4lSu?IR@0xw~BJ(5t)5bj;Dt~>n zZ#KDqLQgPpE`NZ=o zr>NZ46FD;!xUJ1+a4v2S_G2iusAEpIcvnAt`HsVla(WB+c#72BCVp0o=u~>X_~M}y z6PC7kj)pWx2i}k3ca^ov+^ywHdh&0)N)1@vct=w3hOP3Jw-pDNSZg`OJpM@jP|aBjrjjxUn1zEb%Lxw1pDLT z%foqYSV5RtF3~y4^s~IB#DOi1pJU&h#yvS)X39*~kHk#8o9Y%St~uzxUw6id za7B>uA!xkfs?8cFhg4?f!>k)8 z3a(tdS-x3iUgBKtXBQ8pOlW7=c8>kT$?5m*rxnPi{dPzQWW2>MwCI6X-I<1IiLur8 zMwh+?-2C4tBfa44i~syQy+0UtP1TbXh&bLXHJ7hOvHOl7<4WlqW91Du`2=hwf=_t7 z?%0sEvfoUot(s%Sn)C#TcfTFoBAz#YGhe{J-={J6Kl_R4%3s||zAOz_Ua8cO>!p7B ze3TOpkMc5RC6gzUSd}L;AO64Jc`-9nk+!e3!k1SS3ziE-xU;C)Nmwbli`yg|xc)KW z$@A2NA73g1RDN8PoOrSBpTjN~a0i_C!GffWtyvsbcQpJ<#$wyb9rJWC-2QC4D(oj zes5?@+%T_$^-WE~9S*L9Rqvaa&)U^g*3NIdc6zOcr>w&EhC3~G#!jzA*ls;{%z572 zng3y4E62-@6TM-jixmw@oD+7KUURpWU%a!>gvEoeapImYT$URWHY=p4Dqi3@QE+d9 z-IR3u1%g&H^wnBQ?Hv4;X0fLzNc~)rq7cB|A~#py#v1k)C959>xi?rT{=Rq9XhD3N z#gxCtS1mP+YVBVlAfea$?c%xP8T(WfS=^?_Pn;Li_S;A&prawp@x(cg!wV+%U4HLe z@s0VN`i0Jj=8t71Cgy=lnVDuK{`m0Z)Ph-G4@}+RAS)2HOVsSOVTAdt;HcvH|JNKZ z`2YJw&WQ}}jE=Sg0r`9S%k11X-^<{bAj;J8t*&QF!qN({BXLvMvC~I1ETg7#ZsDx$V0ly!Imxt&>l#PyNuH~2HZNS(Uwm99 zx#o#m|Bj_$=cYbOmU(-w=Yhb246&3Qx<{Ex?b;5%VGpX3Gnp%(GnapYvF57=o~!5B zb?R2!#v<-nK+)PG%Cfr6b-49WGA0(izb_97W8p&2p8#F)-6hV z&iuq~nW7mp6ZhqXH#jBdGD@yJVCa-!P~wsx%YR|b@fVY{*K}U->Pt2GI7xu%O#M=~ znu>|L{&>v^t~k;nnIS25be`<0xf2Ah{A@UC=$r2BAj|*2hkIWn|C23lMeHs2$}<~e zxL-N!sr|v5znnRojj7bdVaBbw0$JsD|Nj3w%y7tOkIez@lz++}1T@*&gVbBJkK}J* zG?rr8;hdmgrDS03ZY{T1b8?@e!dd%2<_qh8e@-^>7363XyvZrqIG6uPO2Z|=#1IAh z{sYsZCSLg15b1U)Kxpr~iw%~1Ca)PIy}nL=#KdwdB40#bK@h}k zKhbIK6wa(0?Ha}gG1crx-m{0-$+x+`4Ki-%jJ0yrweEb^aH0C8=!(S-tEX_!3Kg7o z{B7xk_(~VijZyU_2bsI(e0_geoQ-XXB!9_aiJdzo9De){mzk>{k)AT4+=(SpUyw&V zVEN$kZty$#Vhx+GaAc>h zwey8b`HML#O;}dQF+GxTTD;J!SD-;QyE=D5iIdxpNvjXeSkW1EnK^4hbDG18r;JJ8 zvI8E8T~I5nDQo!Cb$0)PrQuI*anJhtVz*n-=`} z&@TTz_vM1Vn@F?`yeQtcS@IQ|akAjbftY)LZt)CKWqcf$LKHQviv0zy$N6)+# z*Qghp{+b-Ukf3I5l;+?zJweb1vi`R9y_1h$Nyo{>htj(--L3+S{AhJuUDLXl|3<M38otiD)PYQoay&(U+PX@c1F6LTj_EMin#xw2N}-TwvI zoeuqd92whKOz>}UtbxqVXuOS?%rR1_XHaj zL<%el=3gOv$i`y%<@2?dk_{g1KEiPC{XvJHEz&8G*X-Gf%vScFtLrh_@9vx+QR;Bu zd*dIe-XJCChM)Z+%sI-xUVPGi(`Yv7dws*S#Lgm)OX~KGR!Rzgepxd!b2R6umape{ z6QVsqa`EXkZ6TE%+nJr-PhMYFxAcF8-9Fxz8}=$ZIal|Gz0B@kz50KiA~i$7w)*w= z1pEU2FZ|wSz_-u%uH$b<2k(tPBJF~8lN-#|8Bf|_SX=TfdCOcgDW=2PEN=aeRdwxV z{`X=wos%fhw>23`0nbaPxe4qo^Y$IyuAaQW>F1|y)()#r&emA8 zh&Cc>RR~YOgvo>mwp09p(xK9B0`X z465!PEHS*bQ6g}w$h~Q%d;9OP>UJ(Fe<8f-^ShJtdDh4*DR1z>mF9mhaJ?W1pUzGjkXlI9RFK zTkMqRsd(bv-3hLtt=bMOuw>0vNVhMz$@{A2&;Rf35AWZ%XP&0vxLLvFJ$vI_L8BL& z1e6aqzuy#6D!T7+^+a7J+1=JwzYU|7^|c-Nz{_|+=S0RIA#o@6rXTstt5#h_6l5cBzrhyuEdz=}}xQ(RF z|8QP#WLhudmB`|WnJ6w_gQ7PoXqj^i7r%A{y+e68@VL808{#mua;H&qSSNWbmqnKoy!qQh+giMfmi z1^1oUEWaQ%f_bihXH=J|M=|f#>4^_NtF8EK2nw^BzP1A=I2bSJaAdU9o9x@z&Y+Pq z;k~b9j`v1~Y8wadwGPH|SNfctPH&iyZolCs@2d_EyIrRbe0+O)gKym8)9c;5`x-eK z9gUfrUhDByv7B`ardz!uYbbqzYgZpg>U?vz*Oes_Uhk+ixK=< zzC6r#ITt=%!@j9~retCNW}#Vs9r!ISUwI`juVy$}Niiv#gG^j_%ywUDCMX=YD#~8@DRCl_KR~0=O8&^1 zx`fv)4SuJk{Jb~0Shl!zpS>uspqhhcm83viVA(Eq25a+YYq(XH$6q|myx^~bOTL#p z%S^7yWlht(H-N%M^#yqL|3#3Fhtz>>U$|^b8_bqmuD0h`^VxCzl&)-k4$HaxDdyh1 zi)$4Z8!Ie+`plu_z=BzfjAz|06ibTrb67L~;yLkK{l@!03aQFg%G%s#9}A_cw@fU& z@La{qT5$m%ukhn~k@~(eJ2&nN;5-(=v8MZBlElg1jt+I|WtLL5{zn&;KWCmMcfne5 ziQe8rQ#ZFctGjqRWNvvN!Q05l+32{PC0ilQaf0)|yO;N0>ExKk_@c#t_nv5}#%6{6 zn!6?E7H;`$7!}jkb|8a8fTMBZEl$Q#JBK=Tv&IYAn%5jk?HnF9?BQ>@vow6iq2R0; z^Cy@_UFd0JSnHHJQlvA)TCV+ebf~stvsxOo`!nO`^8xQ#GB`E* z#S|7R8Yn0lXtbYklx2?6KYGaY@~3%T#tIKoBT8nlGA@;>P;bdBn6JqYDf4Z9;~hSZ z6`vdTe8~d&B@5yguEvR%I2E^lcI@}#c(LMcqtD6(su5xbPP1v={oZ(Zrta=k(1<G5slFxBuVC4^Pkfcg^X_KF_{s;gwte8*|iz<@pcqFPG1dI`hImkgkJBIKGk*P|mt(B5*n6ED_i2!87`>br%8WwJKa4-Dq|j-ZHC?9v zkl(RepWm>!J~X-Dz23oCe!)5RGr~DOYk2Pe|FAup(k#UWA)AE*0`^1EefBurJtd#gy|Icai5e_5i*#{T+aR|%HAHILw zU-Dn=FPj&}O#4(L7u@8#P_+7DB>$O=KiqR2elg#<|6lxcijeUo8FlN=8I=~GaZk|9 zPyuMJ+j*-plXaSS$w#HNNmDNQajf|K@%i!TjGhIXbZU669Y_sVkh;mZA#%e0|Nk$Z ziQTX?;=QX1TWOl~+`kgK-0W5?5p7-~2doqqbTil2{XPBR^=)~DV|6KdIn358W%*ah z9_$ud@nC6$$%~c-EBPPqWD*}ePfd7qJ>duQn--pLHw9u|7L;6LHcoMn?VW#N$^Y;6 z|78A%Yj*!>+H@1TtmLWjCFg_{=h`l0U1N@}VkmWTs4y>3Yq@fBLSs}_tKI9ycluRl zn|Pk_op|x=^Tki~1}zMa>lF?>o1nk`z44!)KT9th7h0j*^v0v;Tls-6_icYpX1uNY z;>?;iJZIKiu?+kE|GPYof=}Q9CjaY9x^I=P_8hz-82F^-#DWt)IhKpNS$w%&~e#!8FlPP}+3L#6$|#`b#2KHFc$FVdY~7`|@Qmz{8lQ*uS`b3vO~JTErO z-T3q6?|Xi>sB=vXZ))_F&KXEpD=x0KcRT(2pb(Qqx`V}!BN7gCCmfUuol;`Kb|`d7}s`xgD2S)=3IhovRaw%4^lP{r~s>^k>qS*l+8c zc=6_V2B-N9Cx&!(mM13`ZsO^VV)S~?$FXVm|NsA*uS)l<*>Zo`XZ|~!KUucTkE?dQ z(qk#PC7Jg?*`=yt%Zy{qbNbk;S{kgBk~}smZ#j43%bS`5e~fN%O0Het=FA|-w4je8 zrBkfdjnQE)--n(a8E$4>^BKX$eHX2j-pkEdo+)%_>%loP-t~WfpJh0-rRYPso?P4W zqUPjdiCaD!Ms4EV2AX?NILh%t;-2yAfaR$xcm7Xap;8~w-ZE>mvQN!{YI}#-j~dmB z8_kZdw(c;>u;{pGX z&uFxgQ80Fte$?*O&K!Pg$M>I{hkr&_ORlrCJN)6tdG%FliUG@=r?pOZFg;C%}6BVvem8Q?nM!hcXAZTShuLvH}+-9+@I@&|2n_^$KUE zPsjKBub9fUqPgjvy<37hvkIFPlZ4uF7E$N0?70gLC@gZgE&V<7;?IVkjnn2%XaohG zImn$W-JBW9IS!buI~>yRL*d&-_Z#V639`Hsq;BxA_t?%k^z-fB%RCA^pDtgN_dgI< z{pY#yNm-!?b>`cFyRPu*N9iAx;@Pb5O-PMrkxUbKQ6yV1$Aj4W%vm+f9|A0RyTuy0 zX8o0TIhQ|R#~~{L30cmY2WQXBy!n&irzaleC&U?)+WFSq6wErGBOtB3V7H^i%$u3p+uHq?328z=Ef5*wjE!{Y0i;Y)T1KUuc_zZ>^QP`%K2QQ&|))BXGQ(w7`rUbpZ} zuaJ9N)AQ`cK{+O$BNhTC+(uGU7b_ZwI6b&(`zwB4l?W5tq!q! zRlb4s!V8@f8J&>TsFR!+t}rf4Q*XJJ$o{G#gR|#ek=-osc0Ue*yNrxyn|fOOI(DoQ zIQ-&d_!i#-TV^rtG;5g4;FacB_gD50>oJf)Tfu8v8?;&44u8_lsbem6SYay7bgRR! zTZAR5h;`TFPPFQHgY&a!N z%q`u~t-B2z2NNZjnhVWXwq0j7`D{2#%iTFaqm4m$W#2PF*?qhvH+cBh>YtE48Od70 z{Hx%rz2)2m3k`l7Ms4W_wGeyS81@NB=>4|;@KdnTEJa~@nqs+)Te_{==cfUDjA}(P z_A=IrC+eim^*(txD|Th6$h(ZfHft8Q>509|`XIK;F>Sah5R~q!aksMuYVH-kdwzp=5>#KjH1qW6Jf!yU<=zyIqWzW@KfgoB9(V~4L#z(FgC z#j<@DTTFwT8d`<=`M&yb?3>Ad!Dx*+x0|)Xl`|ZRy>GYGZDiWVpR$GBD9Rb!_Uvh6 zxF*1GSDEP$56_D49VfUm4gO3HaJ*=2wc2o2hg%WHhJaT;7vADj-0~)?MA_==X4bXS z;(4#~*i`MjpYhZf)G{%UacT$-$TCstIecRa&Ll9$ni!yr)E05mcvDciQNz@OvH z+9Pj%O2}?p9v8N-G@?tZkiTM|98aEv?j3};*y1^Q$}YJDKh5A+(8eHa%FJ?wQS!`O zfeE)gEDvUv9GO?OGFhc%=?bIs89$A{Hlq>_3M?~L$U1Fs`XU@5cFM@PV z1#{S@P1+KB)ZO?uxDx~>7+M&nFZhzNLztuSqJfmJ(qhF1DJGvS90E_+{yUuOIB>`D zq~Y$xr#EQ$D=Md|WvY}k&6w%d4er@Af@{h4`8+%dHd1ona%h5p#jjUP%pCn~><HleM_;N&SLcPvb6rm+l@(iGXCeSy$X9p8-2NgM(+6KtrjXT#Z|) z)HXkM{oNwWr?02;_)K^u=(o9#FUp|j-G7O?nbKEIzSy@%;LXP51Agpw@==|V1`*va zo2O2BrPed8ykgJNfJ^f%tcu*gC`a7uMjqx zWUaK|CV!Rwek+5=ddz#%9Z$ThX%M;;@TTFzrrxlH;0QUa%aSmc&ud!n!`BT9+Qqp` z!cvx$xTW;`m2~^wz;iYR)Iyx~RN;F0Qmcxam#DH8`5*YjHmBtG@A?-aXFy9` zj(yMI;F&M5!0kA*r3s6^zp`e5o0q%GS=DTl+dLZu7L*=mwzY7O71S=g5Tx5II5~_h zl)Xi6;lJ0{_1SI&X&1d=KHJog=6vF!^&~5$FELfEa^m6T`%`wX9r@zn|KwcVfjeeX ztQ0^4BDVz=D;n51HQbWrk67{H-ff0^>`qx42d8E59+#YW@oBiT{`r#lxC0kzQy(^1 z)To^8=$Y|0aY1CiynS83m7fet-9)1mHwi!8U;kgi;oXAA+h#MKbhyUJ#T@mh;agJ1 z#fK4bUe@vp9HhK{Yr1`hj)P{jGpu-A_>h;Gnd9=KFRR`^T9(3k!Ty2Hhxzq9Jp2Fm zF57TXKw^gg!`Uj9H@Y$#&at0(zMzkP1+$6JrGp(a7#EgYW42YCuv>)t=A4IC(nbN^ z>o=r^MV)I2Sp1o>_;bJv$e5m3PuqbDe2wh$B_uBRZ(h{ee_}4HV;Ofw=Cy*EyppkX zrY4_wS9})acvHipc70v>JN9|=Olzj6@cxz*$SSvU=oB{LUX-Nl5@^MGwyohq!Ky3l z!OxjR)@_-^xezqrbnfEJ){D#Df^rjst}}zlW5@n;>?ip5@6_BsrC`UIww`%4rY4`h zCcLR>aN@h7D0Qy9i|4hZKvap{gw2;<_;4thuth&-ww&i6eL4Q_Z?BL01TNSrFYx2t zDShsv=+Wj%u@ulSZJ~`6ld~~Pg7>-?Z>xgL7e6k(A25#>G-mndXWE7`y9v&DJI=N6 z+~(r|wQY_V-r`J5kT^4!|A|kH=q|&#S9o7-c~f!Vj`@uKC$hFbv$p)Sm11(%XL+&p z30L%qf;~285Bz*(a+N7p12kbbzrW0Gg(TDAjlxDcptp5A)4IkRyvP*i2i}OvL$)A%cQvvkotpDJ*CZ1`2Co-NlCyMm6F~mAQIKP)Y;%#!E(!Z30jdOlFl>I3;3|@7v=}+Ul z38o@u%lqH`mH5MYJisP%)$dPEY}wBrZq}@gINNZb@0RR}CH}onBhH*T!_(8#(`@&h z@9DYY3H)~s8VDQR`UxKWWq9k%aP8rbjn5UB*PUZOBPyf!EkUilo7u0OciK7jGmTd) z1i9~SZmv~p2@dFTyk?PL@|)+8fW(PvI}P4x4@>+{Y@wu7nQwxJU$@D+IX7%mWO$V$aQWqdr(6N)EPIuWZdl1HY~Nf{d+I=SzVcOO zVUy@HCLYIMf(n@(EKA)tUr^v}T)5%ooPZ0w)0ajZekKuj;nM2HcQp+{ycw3$B29j_ z^1qmL=wOx2`VJ;@<`4K%+Fi|0Z{@J)Cby{zSK z$gt1itxSA&z(B%U!QlI)Bu%jlwiJWA3r(tCUA>@T({}4vam+$1nKZ|?qdXiL-;xc~ zYQ6MyWPCO&EZ!`~JbjmgsLl(Cn5c7Y2F%lq3K;trOY9XW-15~{ifIcsV^oQq!@And ze-#d=Kj=A?(6{^jqh%rG_xAq>6(YQH@%?!=@_&{d54cm&rybIMSm(rs8H|!Wo8@10 zw#~UYp>ZB-qwY?r+$lVL0u8#>3$AHKF6d)larxjG6RE@CvVRK?V^pb~Ltfoa-bbI} zi@135l^?U`y6`>!tFZXDU7Ooa!e7Ba_mK&5*rBqK8%=+8V`XgXItK_He4S)Xq zt@gM&|3PZxHYc7VXF5QGv6qV%|F&uK3u-ELbI^0UH{qxF=}9aB>dmZGNoO+JA=&A! z6T_9C47n1^TU!^LJ08B}75^2^hn7rtp5#3?&`6fN#<}p>$%q9@BNS`|mM8U=*|qs4 z7Ja#T^x~xa39Sbv#5I`;Oy>)-{>M@3lChVE+vGOmtBQsf7w=fY8&VE?1sLXrxUT+C z^S`!! z+8`-7LEB-jph4{u**k#?QX{VH6KA>hk|ELv)OcnD$IW6zhra?2c1qK4Eo)A*uX}j2 z;cWF6g~QR7t&Y-b7tEaSeODxpjJ|*H(`_YH=b9Syq-1RK$}^@)94`DRs>9~+eO5#_ z@7dcI+e_F}R_N|mnv&``S8#%qz~6Tl%iGHN_Z#o2|I_^N@#T1tr)2@^&Jm5>j4u6U z7H+enV7C7jSa9`{c2W#qR2S=^=1MV^C;jplE^oAmpS#S$$)VaYqju8$7lFGMs~%6_ zX1ri0kp283A4lxtRD&2R4{v_%lZ8eN1}FIV`1sgv=$x3%KH;}tg2^W73)bR`=k{Ja zR0M7BzmR9zGVkw?U)4X3XsrYRA7=J*A_{KdcR+0y^; z-jtm1@E+sAsWAz2yDpwPnz1_%=jh&o(qN&52cw-$O=x-@4UIj z@0`(^i?(uy&3R>IkDXqhu+c2U|Bw`D!N*=i2f)oafurTX`~Awsvl5o4HfCIqRnm!{ zXSkuR_LRfBWu+1A%p$WENcLYmVh{48!+!yZyDfGsL3cgw7T8BAfHz)(2?ZyH`*-D) zRp&TJUvvDy-mH1&^a4N54(3-g8Zz|!*w`4$I!snBtbyK2pXXc7~6CJ&LdhanG zGT=gSj0sDIAX9u@f1CC?0ftf!ha!Wh2$qYClDu0%U9-l6l1x6%rb%v>Rt79qPv{ks zho&)br`jQg!{&#LR1jFK*_LI7+u{s(v_dwUS}7h_w8UZZ0+sat#}oE*)|#B{ZDX)? zI^cCC;Rf56fN!^7sC`kKpfhuZ+wacBMAvf8%x56&Dw0HaGv?&~j~=75P>e}N z?;B5in(cyBn?dV-mVLe`prFs3f`n;X(FS1$*lLO1+8Cnah{M$oRUWqpRzZ z?wqz9c9t#rkG{XZ7+blR^%AHpbpT2%Xg?q>-7YAtAz#ZL(72zJI>W1=8W$G zBaS!U@MABMVtmP%7;v2R8t1~&^puj^^8zQ9E}nhCz55c_RTl*$tP~ldnp{`!RXEae z=*6ei7w;HJF|ANEkon%I@cZS#W_BKadAk&a<)0hpg*nU>kXV*#C3VSIVL{tZ575XD zqol5vCvW5B{p%KG7^Ys9<2?d0m(i+?!E}1!U!{*shd`U)x|1&GaJ*k zlZ~sIc8D{tV0JohvFw}Ai3#r-8kpqD_S`5qo55Uab1UPZ>wbYBzn}Bp*koT{XZ+{y zZ}y`}Gw!$^+s(7NK0k%wY>~otNr{y;F2-w&jjW7~W-+@tH&iJ)^!jluRhLRT8BhpgqZ!61FUTOxE&^2mDS1@XxIO|IbjyXpWu2y#;CNDJRMu9E=qXm&$_% zjz8!+ILdaM7GM3|@5flsUK+>unQ|c(qw!!8!JfXUd+J(hn#_#Kq0i zDsSic$#NE3nb8h$~pipYYQpv_*@|y8g&7VoZ3*tj~7Ty$K zjbmeD-FGp>3cToTh3-))9`E%RoF`ve8gY0LGZWX8`2BT;Jkw`ibpKw*^EPSnl|J?p z+ZROkTOROzX7bfCV?BpRaMJk~lh!)1ya^q;mIPP-JnC6`Ww&GA-@z!P0gsXiX!ik*DKW+S0`IvsvNrGG->d1C8#V_`dSK zT<|nSMn-1w(&GZWjq~mI8UOj^dF$eZl9x3Kt?H&}&TiI8>Wzu88-CW;;%J*XE#}Qo{TzL%3;%fP~lF33W?r z+752`!etwyIg?c~Om@P<4IkcDGhk-rm$!YW1Pi z;zKLn3Q)pXSorJU#_vp57#T}l*lfP?J@Py8g6+%2bL^Um1|n99o4>4*xFW&+{HWQK zGff7(%a?Fv?cjfU_O`-yQ1dCSi$!bpG99>`v6*0dH1`aNwCtJ7VV%|`v7D47w=f+PBOj4 zDf#cK>59XQuS^0ieRSYoda;j#_Y!Yon{7t^;RT*+7ptcj_B1^dWNO|DnjUVr<94=a z_ANuV&f7EElG&s{dk)SWKk=%j!Eg7XpKZlLO;e=iPPn{(UEj5%%_b}k#-a-%`J*iP zuLw%cP|AtTeEy;FRaBo-=8_$Mw$FHxCXRmFU z^xAFN!&xEiUg{}ZJ{y_@E9^9uSGa#}+1JeQ6c$ZWE5*fE?>*pV3^>lP?c|(k>!jbd z1Spnt&IyzVnLEMJjN52MT8A6=5k*O+rMozpLA|*KGluCcjaDuT7-Y_DmY?EgaJk@| za`Rqr|8eGAP_e`3)gOF`)AH|ct-~);Tbs3`US9p#@Uv=*u#@AT$rmQbm-N25xHMvM zY;U3%(*i$^47R3un-w=i@=v(ytZQ-dtqSkz;0*SW4{7?B)j{YcB4# zcl+(Qg{$%1X>N&K>vfiNeq7M!zB12-Ip-Mj-AUKi#~U|%Na%|V3=CuwP`lcz49cG( z7Xc6FNKpoV=)=lr7q?uCADDcd(c1);~dE3yl?7N@<(}KPe7sJIR`}Xc~n3(T4mu~{& z4=XtX?zUp~meeIrqyn1dTiA=tQcA8RXDm1KvXXBuyw85_#*hE=8MnxEPdwwtk>UL7 zh0cisOTQl6peVEDrL2jt(JigTz8nqT8XG<=*dfgF#5F)Yi@{oP!3K%DHFmRZXUH-= z_^TM;?J!qRVDbz;PEFaqi6Y&~X>2UEK`(C#O3wW%@hh@xlJ9ec`}{L+@-JDzRO;X$ zE;dQ3dfA#=JfB&m-Lnrfay2&2``b`iU7{%_$l1{JS9tMeg^mxhpoIf>_@)V1aLtuH zxOGWaNO_arjH(|W9xmuhD4L#N*n1^~`__VUXV0E>IBgADKz!lsv&GwI^ZyO`_W61F zCR@WLY4#IpJm39QSit*o@$pZ5KC|R~jz7Hg_{-XfciuFeZQ_|_AhF==i^X&MFP=M| zz{MDFyg6!a|3ab7Pu~4ZmU`(azEjyLGo5AI8SX0&8A|iqtmO_Xmo`p|n^<+)a?^Ro z?{z#UCot$9{pBCGI_Zncn#RtL2d})4KX=@nZ`vQ5sy8~!hhJP;eUa}(0Uu*PbkT<2 z{W0c7y=t)@91T`V8_sd8c+Bvs=YYYQWJYdn3HfbXxXex)THQ9Z3BJ63zWs@B5*go; zH^}Yw?pf}Z?%3uxORi@+V_%t5#_YNS)$$eYdAfGD7^QO$_O=K}oLSBl^k~~fK8|Tu zxL-vauu@Twy0($w>!$=`X#>LvHdXAYTRbG}zAxeAu3+Tx$M1Np!ea0BZr(R03Nbyov(a(=hJ{CRLBpvwHd0I$P7RZi%M;!Bo<0r# zkf2yBmQrH;E906}Y?JGL6N3yZ#gY%7Kq0g#Ri%|7V_Kqt-r+@Cl8+e8>Tw56m}Ceu zIe-14owJZ}7OUcOk9!xlfVYu3%ok{Q%U=1RvZDRRi%Y8y3h(F7i)XZc_Tbx83)!U$ z7BNrT{GCf)mrH|#F(A2qgZy#tRo_7koya5;mVy=r)!FCUV;2M!NL{PhcG21~W3C+A zXCLMhxy_ZrPYX`1-jM2fcq_P!`EiBoRmlM>8UFlu)fWmgq-MxfpD$>;c#h-cM~>O7 zk~*ojJIm`8e%EYaHoEmkj+aqK(V_S3^TUb%*^4gpoNMYyn|e_|;*X+1jJ4w8x&4j4 z)f@WQ4d?RJ=&_c%I8)yR-8U!>bOB6|Z`xS+Icj(_LY#`1|W? zLyPEED|ve`Eqds&1T_og{LdHPgRW9LVi>F%JE1aebP z8^c9KhFj*=xBg1Z;Y>4-E7ev~GMcr!pp`*G`S0@j4+p-r)%-Ym;KRe`4?5;u>^uIT zgZ+te8T%#I1%4fSR+$}sF;9SPk(J^GTg5AJlUP>;JE-Sh)Y1htj#nSQDB!@|c#-$T zV$Y-%Z3hx=u^a9Bll5Vl(hs(;{sQJfZ@1_OxvRTb%Qb8FUU;=cyQqe<=yV2q%Z~}p zc4E^n^>M6_W1Q*U9m$^}-&^M3b~|dZqC>NQLDDq|-tY{L8JjZu+gRs1B^c-)mYVxl z;?GIBYl4kCr^Frq)>mf37JrN3?e7I&`uMYcaXk^6FxyRES7om-(`-RT*_+;PHpSfF zv9h(2GXR@B+YQ`DUaV-~VgDW!5f{C3fF^+JH>MR*)xiNzWCR7 zaHbjC^n+l1wU(}VXf1o!N?eB}TC z#V=DQv^T6-qjT6H-pj)3w_}Qu-9IZRyKmW=#i!S^ zDKR!!DfY|T%T3r~4(fDlvZ-okxmmv99LJ7k!z!zz6MBCfwD`@)?Q7;WfvF)!@?UAZP7_Gj$DCvfO$3Ebc5t>@2Ej?{b=o zg+u-vc*7FtX*(B#bya|KFEOWCsW1lUWh9MbyA>{f`JcP!8U6%7Ow8D7;iq}gSpnwzGDwmF@uD0qG#H*xsxB>o=;!Z%DXq+v99)a^P@5|y*I;rQ*n^t@RfHp3Eb>A-kfS?=a+Dh zmAm1?9hhh)Aj^2{;ujw7#>N}6v%_ZjmTB?5a=Wc(^|pC&9I#^i@}l4Y zxA2#9?17t=zRcj2Y?<5FIOng#*_+MEEN}L@S$iMW)$Kdi&@)YMv0{Td%L-d=rq?YK zq+V=@<+Z(DNTuL!2~|Vq$S>2-~c1SUA27Y$h2oF3Pe{Ji?%4Cv6Yi;HqiSU6f3bkiIi z!kWG{3%qJ+uwr5sb-aJCHvNG4Z$r>(G^=JymW0`-+p}~g+DIGClF5`~I=s=?RX9 z@EUV?M39NJ(JU8t=Y|sk5@&kebhN$Ji!Ev9b9GQG|WCfr7# zC9s?24_m+Nmpg17wWYU>VWQ%Ja|cg;`2JqLZGZj00NXPTa|M#sO51MkH*e~HvGi$X zIEyU*n;M1pe;G=hZtRGVOmKhOmuDe=)~MN#rL9_7wk${AbGk&ITIi~_0|oDR8q=ge zjl&NgzFl>knB}m%xcAD<{{R2|lY5!n+%6|hT@3OL>z53U2?9(pclPkix8Jwib4H`z z@mc5A91QqY!*w{TZ7;K!{tM~zj>Za_J&io9O&1qurkb#@rE>I4k!-r?cjADWJ+tE1 z#8{?=G#RnG>!d~MWZrF--{5!b|NdabhrNq0H_AxIVf^b|gJ!MVImb?vhl&A#6^ zVGDTPGEtLzP47g@Y7dsX8SE)rTn(j|RKO=}thG|)-)EO@@#B|FGvj6{iTEGY-FdQt z1<#pxeRrPZ*>Z43=w!!9l9yiZ`2SP$u&qMaqp5Pf`XxM#^7#tWY7Z0_+O>1I^fvrD z(LHP8F7u=kwU&RGwvI>hT~Z8gY+Bw3N~iLNGhd2kv@zfDT;R66*@5d1|C^46DF-qF z+EWb5-9Sy%vnwwOC@8aJT;*geb(k=>`Ho=a$N#d2yZ`5B3dL_Y$6j?j*`)A-J&VI! zzKHh6?1C40gPAWgzv}2|Id{Utewo;ldeD5CfZV&ECXQFl(2XK7*2c5nG;FVOSs6?n}4lM}-h#ksRiZ{*u!#XgVm;8Up!Jsci= zv*rqFik;A5|J1{7_FJ@Zv;4{|$HktlZi)=AEB-79k}uv-?&2{0YwwpM9It9TJUn_j z5*SJy*s>(WGQKfi;grgJ`S##jZJq@)1)}nO*z+yE^Q23>I=#-pSoVRfY{`tb3hKIi z+xkv`qQcTtib}@{qx1fqi)nMLXT^aA z|8H{FoL-}`vB;v##ZCXE^OBBH)d9sCHEBk{`uJY z@cQ}o8eINC)(Sgxoa0xqzAia%r8&JIhXECr@>jE&r1rHm^15=SxcyW4jcmtx;S`ms{8lH?^A2*mUj&eX|@h?`PJ0aHa)J{ z!t4}x;V;X**q=YupNM>)UoRUZMB8}@fk z40nli|B6g+s+2rju>W`Sr2ytqH;1$aJ;NiZVsHHV9~NzSmvH~Jqu(5(O*#vH$0~vH zKHrHBp2pVuX2uh&9y@9*m|(4_uyx6~whOD6oqGG&&%9qOD{yHO_nOCyuSyP-D3#l7 zn0f5*nF9{5`%VPBY3V7m<5<3Tq7k=K|6c{rz|b+lZ2}T}o8@*SO}n>Q(Pyz|jtPrf z5Jy9r?JT?Vi>jV8i?p%V&rM~R$-9a9Nc!^!DG#2Crz9jlXGpGUH(v3W@m31ot=Enx z*BsB_Q`BdvJoYJUEnzw97i)IZkU$tf$2=)ZZ_ zeep|&HH({F}=NKuPT$?>Th=>QCi_J0V|rV6c_xJys}3@Ann^_fQ05;{wIDM9lo!luYl^7pSdnA47O=@7np@o z(q;3du6<}NbxWAEfv>Zx!RGK?|9(jU)`Rv2lLd1hTL>!)GyC+!onAdh^{iVlccZ|M zFT$lKMK^u&FZblPiz;_=kQKNfxVQOd#l4Gr<(Dj#zM*r%!(y7an9+;rEJBwB8%xbV z&NyndPe3AbF2Bp|WT_=@56UTT) z)EULucNg>s2e2QBJXK?I`~e4J!1KqS{ohP#F`FmM6{0BS#%3m^JA<{Q6HA<}_FZ7i4cq_W8(U0g;|8`S-6eKW(|X$&?g>b&oXh{jVd2wbUqGW8JQi!5 z6BMlF7c{WW-NG96uXT?|_6oKgO6$*LQHp!?)ZokBG0ttom(Ty`&wSit+T zxl}BrB;M9IIPq>#XF0OyXwjOBzAqM67FU!z z)XkMG_^)_>jo%5w1-|#X_FQV#^K;lNzgYT0q5J9O^LLo{)bH`GENPmS^!Jzh?i9wT zE>j8aCQzbfg^b$07ht&m`D6aAj04Wj40{a!{?A<14sI%U^4=CuSo+Zav_r$$CV}ks z%}-t!Eq^#g!~X8lzWj_@llKWcpC=YA64pIbx8<{0)Xx4khDyZ`|NReTTv*t8pk7Mm zyftX3GVQP#%Y^v$$j>J8y0;FS_5jJzLS}zXb>?iUXfi-)7WUi zU$N$e5ACZyT|J?xz;@ei!o_38Pc!pNB(G(#+DkF1lsLG3uNC0Y$ZfP>v9D zd;hQz3)|&?{9a5I3e%I8u3+tb23iWg0kokeK<>-pM2lIC?#>N61b*0C{dTMgVtmWK z@X*Q#P=N_rL)2`+;^4iJZILp=rs6L*Vjl^!SsT9<7Lrwe$9yJ3oBf# z*kI4%mTvFiuXu%HGswT^K>nR!w%{<+j2QEan}wO8KAGP7DKRIqDR;{jIo-A3kz6}$oJO2OVypiKHS1@8Z z^OA}!j~(xJw4ZHKi1#|N{>*_7uXs|wHCV|n-YmcPsK`!511n}DP!uy%gAJc&^pE*_ z(*$dC`&*2XXJ;NZVtI43S5mC@wvkej_?3wbrD_RtCsog%zvxHpmd%dymna-Md*Z{h z*Y#{M=8Gr4;<|7${L8Bvjurg#-Wc7=kXt(goOZxVbr`;Q#JRZzPm%@aori~wSXS8H zcIb6rD(!k9dSkI{U!(W66LSU16d&9ZaAa$n|K78lf5m6TBUZcKCvWKhcg-bu8ME3C zy!f=b(LWfp2ITYC4ZMv9w+Pl6C z&c}qrlm*|<98Y-N&|@~sz4$q3(F%jEb3(~~c2Vc)XRIATS-7(1MjOM5i}n#|a%{or z873z$>$5n_6;Ne$V-qxFW4n-6l(T(i^N|VGa$oip6qI~RHgN|p!Rc8d@Wa2=`-@vJ zPZq}n;bov~5n{5&Il;i>&)b_l?!h-X_!%X2-9RQ>IMc?mVS8hbW0HbRfcaehV|*t- zLoE{x!K2HY1%8xgnG~=)LdGo~Zs2QdoX5&oYL{_~^Vf&Tjf`#Y>yr{15@+1V_$4Qz z$gnFp*}&|Jd%AsFJ)7j)GreL>;Oz{HjTNr=3qEU*XL7>EPe<6ZqH_@7w(7S?Sa$uC(lg`K(v$3M>x2f93NfBGpTun;PCM(I{}7+xPoIAIlnMr_RO=ew;mWZzo)^ zecLScN57A^Pse!HoFHW?KItd>7?0Ltyux^rqvXA6{=7SlJWOy4V3NZ2i zvs)ak&T{3a!s{p60q&1&3nE3gN%BOw39SGvM{$~-^WmXdfzaz`2cB63JWt+mzHU#& z$EL(DPEMyTajy8RsHkWdb+8vS_@&T#VE_GFiyt~R3nV1%^_sMDakYcnxCFiUt>Y|1Z4oQ^L0i)GoQ% ze{l-rg!%~Q1kgeExqT-DEPi~}IeaiaedVk23lsM*_^YNO$rYXE+N&CN$GB^~R7`8C}{Xf6uqQXK) z4uefP2?;4Cs<)ni29Zt{xU@0k6kC{DDK6+^KVdUzdQ79=8mW$(d`U?%PxJ)jVrRK- z{=@i+r@^eL*-B~4y%~JB3;3*hvsa}2xY%a=)X-F_ZL#PdP|>*WxXlef6(f6U_%6NpCot=Ya6r3*6U!#`C(OOyT6vzThA&|I z^1@Ew)1-SD&y%+l$%Dq%B+e)r>|)6_sqJfH2;yk4QdZDg;mousajwu4>8mGay=}P3 zc>A@Xh;wa;S?LBkie4erwuC(eJu!oniqP_d-}Y?MRGffqtLx0ben&YQB# zHDS@?B*Kgcap>35h1RI2U@?ImVf>M$cm1bwptL(+$d{mTi&CnYZ+0lt_xb^vv7x z*)VD?INk7k6Of2)GM(k-?%Z%q(ICc3{=`F*T{77w_b+IIHi=EV&M27$TJx~szGA{D zv#RvN8Hvt!1tj*ex0q>mU8!~e4Y?M7%iwsx**HD^-{I8wnt$wR%}0(@N(7d8esEfM z#Zf$6qHiw$g!As{PHvxh=Yr0)Y}wKvcc$7tVQ$aL`0ys%*439APaofKu0wORS+nG9 zzQY;MQ?^J*@is1$W?F2luy|#;3CjXShSxbUHUFkF?tJX%$MDkAz_7sn@0kUke!l*| zcmLwd2^ar3w+l$jWmUABz#h!bvh%QGR(f-Ue0pJfEUS$*)%bJ}bTxs+AyKBqvI0^|dO_7^n=~)uA4P^&6){yG z`|m}~U?smGlJCO2zQ!4E71Vb2mbtift9}uX z*vsAWE3;{$W_RO6%h@W;?&%J0pPy~uXS`vg9d)K`0lVD7oBTPAwmDWx3nT>&Up%eu z)-7_Y^}q`qj&~bmJC=rXzJD#jmVKPrc8Qy{(qdI%9Tqoh1(O#I4AbKcnbI9S3@bt2 zRc|llxR88|S*+nniQNR|`iK%2&B#!}42%A4lvERNL^$;fBM;i^-LN%+v18 z?LWBXeDfS1w%d!1b_Le9hzBmX`0HZtix5wi1y94DNSIhL8{P6*;LlO>=jeeCFN_cA z3CPbr`zJ>rP(t^(_om+t;Qi|J0=-|pVc!+q{w3$ci=Z_ZgIH}@9OiNdxHG%_U-%&- zE8sXwNBq9ur#}2Ozudu}U8TEM>P@xn2~Q4gmf3Fag(MeRf^y?mrFnDy$}8MzP;qVeYK}QOb?ZixmJJE?cP7-su;Z*pXX8F5oRxSbMtaf+49+O?-J`< zoQV<>6TVo)y>hYMDLdh!tpd;D1}#O0*M00~CiX9Qebmupg)!6H4xW(b%ujTlaI>$R zJIn6>pYsK;&+cD%o%1KC?r(Ab-gIGG17oSxz4eVZ8t*YWZkLSwXFF?2f`*HO#uS_H zmv%m8ELPFiPw7-!BYf!3Z(U{%{_l|!FP>vB-F)@MK7lqtPKV`Yf93D8I|bgEy!$_M z%F7o*I&FatfgBfBKW;od@xao^-4;JyZo4USS8~gozYg27JC^E1nSwYI&u&$8p5eoj%~Ox>n9*7ss`q4Vuf#)m!2=%bz%C_{2(a@$8G5+KFtd z9yh+rdeV17VdmEZVjF%~DgK|a^MLfV|I9BJM!e}SvwI<)4YKB{fz(`9Mg4u6GygK& zwAjVok|;7khN*eM=Z{a6Q=T#3e0wN=pHV^G@3S9V{0eTkX=V7I*zE88V%>z_2NqA~ zz3FZ&xl+*}!b;Ade1AM|Vy)fr0|)Z>j+|;X^1JxGMZtQ~%lGDN0&-cK6&FAY*uWx``S0J&9zEoFSFUVMBaY~MGo3G9Dn)mH*=xjd}(H84*o|h z7BbUP8m(l7goH{spDwJ~ZMl{ya2ZVKG!;n?NusGhp#Y5LOzZ&&RgbiDwh9e zUo-jO8Lpk8^E!WupZoCtw{+2w7yI|;9Pllgae7AEnYsxVYZY2P-$T@M$I7}0oZDL-We7PtPVM`ce=k=xy!_X*r3X|iWw z`!SDy#$$)g@=x4EpOmbLFX_#^afWrPwY-9V!x^`Ef|dV%{?E{o>rynBVvt5gJM!-Lfu}J6>Me3{jAyGFrbR8(pT4N|?grJU1xq6qpRDL;J&^FO z=Fh)_2NVS9qCfTpGU3-pp zh78GTFM`%goEWs??gcr%g>KzXGeKp=B=Kqvo=LUx3daMDelvcS$*|{mZvN^_Q$g*~ zJiZm58E>t3?2hD*IVoZ${pr!`{)2NTIWAA^eP-&x!Sn6h@%Qtm9K9m&s^x$U*QFxUf<&lXlK6mG9Vxzp`q03#m?i*;VFIR>L$!PNteL1)C3 zJFg9{IP>oL(#5vCr8myS;+DoCIi}{6m!c;Mr<|)hV8bzswNmN0+hmFMQad&+%f0`; z&T?!D=dmcVt$KNX!MRJ#J3oIEuQ<-WbS{6ygTrP^`9JM;+OSlVug#xF#zu+fKpaQJ zujBpl8YVvcJ~BtzOEo4~i#0Et+^DbLbFOYeTu{%s27?|6hS{t?|L02`_F%hm?|Y-n zw8gRlZGjDfO#N)@1LG$vlW(Iyy$l# z;oPO>kA3_R6@jZiGaB<>;YMxV_&uV@kRz8v>K--ypG}d8kJn~t@)1xOKYr| zzr|q8mK==}xUgyUL4l6=dPeiboA)Iq zB>b}c@#xFn^Ajgtc6iSC;E=yGd%i@#ruWSA*R%cnxW{7dKlX~()+>aKe1hMC#(D&; zrOJ4exf-k#l?yG!)>_Lia51^Xm?*)jp=i+2cX#QtH|%HnuiW8gGMX$m`)sH0!UbzJ zANX;6ez8}&TzA~q_VvY-oKQnUezsSdNSVJOH(cz`eiSWD=cHB2KLz*@J#MS-epUIf` z&t%qyOi3otQogbp_A(o`&zH2LmWu?ivs@9B?9wcfIM>wE_aJzlfdBt}R#E%BYW*e7?&dt=)}of8>X-6J`AHIiZ)AKa!V1?qE7y!?^jrrnI`aThngVLsc?bFPV}BG-6VNye5# z^1O_vKto@Nkp_F31WVo+T=4(0?|%xYfh#SjXyD_&|B%?xDR($O_0H~13^-qRz{X~V z*)?ECPZzabEI`cm2HqT-KiM_%pPt?-g5}N0Be$_f$aAOYNCuZRlpBS|te@BUNdn>N~l$iVXK+pGuHrz%>yw3*jU)MA3H+cNS zgsV~UqG02@uL)8r)e&y#4sM&3l~~wL@|;*ce~WybTDh{7uyV@HQ_+d<9Oo7t_};)T-%@R|NHN)2j4!wpTF3${fdBuZC|;`S@6)7fFx*z_L-YJ|Nr}?{`j9S_4hEZ$!*3% z4(2@9Jfzx*&uO7^uT5p>W>9$O$?co*4pI?$c=pAT(`~Sze zqsJJc+K&GG`#q!4M#ib(mgl?U3j0>Pc|X6gcjLk;8GVf_4s!*>-YL#}<`yYSQ zns3r`8724eP67ESR?B6#3MW@|u-V&-Zk9SM?`oSiO!?trpX)ZE+^K%F@GS(m*v8qA?EVq?RCfS3q_j^`S#3a`~7M4f8`Bze}1PIR7jP{ zybp+JGi~|a*t3np-MJx4k>ORwn_4ErcmLG?9BX1*lprgVKJ%i71TSL&2hVOkjy0DZ zecGAhr5Ike&t!ZxjIbe*105d&s%!-@oHF zo>?dEup3$ZcAP)u@84G$SB*eJsh~q?jX_6&ILY#r+;6^e_)CM8?gsFHgv;|OiI*7{ zh8<@P&vKY2%eYc;nX=J^x%@NY+mh5C}Encc8BxB3V?d}6wp>wY5>HYZ^mpufJ zp=EFg$TK}Dv-)t8;q`6}THSWcy3qjIJvC8q=JK{LzAxnMY7#1beo|##dV1}N&dLCH zmK5_7yf?la))$d+Ir&O{A)jCd{|SzhZ27JgE1m`4&^eL7WhG~(a{bT4rRy)Z9lE%i zXK}&-=LC)W>_$D4&;PIgFPZS;{{4EMgg??AhYfsqybfRKd$uA`glRz}e^rUygl3*A zoGYyk9$>f~ZZvB_TP+9ANlAgK^HmSLSvN=uK2eR_Vv{v}kqGCmBLWqdt?qeqv!8S; ziF#(^Wwzk|ztiUrocY9cxN`Ak1rJB16Lvee&;3{4ktWUK{(Z{&^!ax-c;N zKl>(m$IS{0{7xij8V2|s{N;a~k1^w$b3^TuZ6Egc>m5|G`sAMOz@{_5!AkajgRxY7 z{om9d-=E7L{=fe~-jVuK)zAJnrZt>ln#pMxDNs z%;i6Nar1q5;|m!aJjVnMyeRpz{BMZDj%4OHcMe!7FV;*JXlK|vJw}j=>%zUs7yV9b zIA`R%jM?ahwfu&VPoJKax5?Y9vX?J9XwJ+O)nv-?t?5FR*psy!=FCff+y8r%d4azz zQovAdiKI%^yZ;hgbNQpT@3h$Jc01xo+kt>R%qbkl-sL|ynLfWk`uSJMs}leI%kTKw z{=YrZJ>`bZeyNtjtuh{%~U%#Y69-!CcQ@Ze3vJ?XUkUGbi!XAzPJ4QrA8*l-kwtFM2$EqP5b3$e9=AelxTmNO%iA z-lX=Lgpjeqf~CIBN@@#a1tvtZSF1nyFEE33q3fLB*I!oeulN?q^QBIp@CN97V0*Xe zaf*|)j=$jH&@f1t%NyYS`0VcgJo5I=AGW{e;ZgV_T_Jn&z5V~jxs&1xdhRj){P9rt z@a*vO2V_Mi+*$B;0?(mSFK^G6=XoL9pYpE3@oCVFIKc~=(au|!rk+}5yG6Ql!CtW~ zc4^b46j_QMzjzsOc%8G+3u}cPeLH2j3_pIHeDOi4+6xz*nz<7g?{PClHMzb`jacwB z{7RR=h0KT_XPDlyOMZA7@nyzeiMKU8YrPsf%h=_ctYlBf@k{;zJXTWKC+hIAlcvlq|Byc4&y=b3k zG?coq1#&UyZdXdXc6dT)a=`NF4>=qkUc?2-ocuVwv+=(VaG9Dfw_QVNNS=Bb( z);TYxF*``XlqE1+|hPPR--YP@oJ zvoO=W|Ax1IO6*wFEWAT)PO`vy?(}6foMIWmmO1h4wrMsUoj$wDT-a`^l?0j1j~U%?d|^?{t0}L{G<4xF7x5%_j&673Do!5aC0j&b88E1HfYQ& zve7?${>Xb>>buE3J%8t21=%GT?17x-~_G=8|f-o%sr(VIm)JX`jZToAai zQ}X2YIl|J}O^Q4`=hySy+rwwoHT_6(0m`0zr7JePX8VGom& zqQQ$ahqh;L*dMl-Wu!Y^n8Ww3fWcZe{@$OIA0OUWAD+J5Ub3#{-{BALGv`0#SI_(# z8j$|<`1g9A_=aEhdw!q&@c4JU0o&O*6DFB1{pqn^nB~gP1xNSs$GlTZReQ2+mIU)w z{}V!~ixZzSUwJ9||%YW%`*^D>L3vW%*ej>2s(6izs zWtJmQy!UunzBngeOJB0nYE4jS+MhPW2ZWhktccCJlQqxegr4dVu?-9Q8jtwDIKWl#_5ObQ{~1#M9=Vh` zwS9RRemL{xr58qP6yptfSMi+)*jF;)#uS4Hv&H{^9_5OOQ$5g7yp4H&yTe=oO}$mB zbph!u0q!j`lq*3Suf;SL_;DC+R$LH$*>SVt5}ngcXR8{l6cm0h`LSX~Z=!7f#Yp~B zm&`NdPb939i}*PIox|pH>>55VHvHkTeX;Tyr{n<()>69_r3W7b%wRnjQN;SDrNQsS zqEwL&|J7^`+wb~WBOscy`1A&eHY17HCfBVuCaauU(iqp)`l5n^$$#S}h5O%w?(p!0 zylH8WVVWs=aNk226XvFTeU2Afw5#6zR4{wc@wTJk%;D>TjHOl%vVHOQmmJtE_kZE+ zv#OPnD-6Aw zdS07+{EmlW21ZiBX_7mHnM~e4WBac+5L@vrM$lb5Ge4>`3qR)H5PWlnePXH63gu5x9vzG&QPT)^>67+KkC1Y@ahD7W{T_IKAP5-{D1>&yxjG0wUB~;wKz= zyo$Zzr)b7~_N~qQCft)gFHF85I{U%mqW=%(buyf7GT3w>PlYk%zyGp&9{U-F(`$Hd z-sBI^=|3lC(9?8Kl&N_YGt;iWH7nEv0+Rpz|F6q3*FNC4!@fPD2|qq}_nIB#j+*q9 zr((;S&G{k5@>c{IC66^;g476mLH7ww ze!CaFJleEiw>?|JPthtH&}zxEFI8kOS~qN#zjEt)qa2^}OOH5_?atGa42>?Y6K0C) z`r0g6>QHjxd>zkmTj9mO9YCqdM0Uc$J3oK?6b9EM?fpd&&8=wi`Joj9fM-O%lY7yr)PphO+(nE_Y<|e9hZFlyI8ij(O1nmMGRCro?>lw zRtavhQdqMlhi6TW%bgOdhRyN|c%NU1t7?^T4QA1nSQD?xGb=*b#IY)G5!eqy5C1*vx0NgH}LUR2Oe-YUhL*L*&`gV{PE}4^Lh5~JNQlKgE5C!x8a7u zMX_$|Z#xv$NB{l&SpRUmnn!x;%&BF!3qF+EWlR%Ux+AccEiR5@*MSK_zxNp!7=0+% zXtY6t**}G;%)vo>|Se*H2Vp{Cy(>zOS&9c!d5Ej)GNH6qq3mOf%R}gOqc74yIbPAT5Y(Ec70FY z^3zU==?Z`2MM(jn!y=m>HyS*+US4>Hk3;Np{l7^m3F*ye8!jwUc3Sb-@#;VL9TRxn;rb77IP9Nz;Uju6`wjQ>8Ju4faF^JHzd;8$ke^Vu*; ziLX~c;>l)(`*lrLn@#rd&N^Nca7^??Mckg>jt-mUnRoo@nzmVf0|%q-Q6|~b*6&}p zG4?Ar+N<0#W{v9l`rn>eH{H>Jk?BdDGBfC10|qX2KK)wQPHixk-XszBk8lvTafP`)9p0&-42G5*tjoqQ1GTdb(vE zD`Tvm#jY<|TMkL`GTv%A@WOD9ON(~K%B#2A?@yQ({qWkC*VdKOLmRJcY0_i;^LzHD zRM+NBpB;~G;oi6XiMmpc18-5l;hG)d0*mMNE6N>Sz;{AnkL+LW4|h8LAGo~XpW)`q zY7OiUFKL(bH+^eP`1*%q#$ShT-yQDr9{M=Fr?&P&q(IbEzT%%*ZSGf%=A?7DrQ5gV zNXfo!5a`%t&cDy7!AjxCF@p@TmPuC_W(h7_BK+y;S_Q|~FYSIiK7GUZszpKC@(yU% zHow%=^*tqe+u3hEZCP-WKZ4^=^23B5=UtjP3m0xs47B|BueFTDhPy!jHpBcH*Y^$0 zx<{q5)=Eaj`bnI7d2GQ^jpGK8W2rKPL8}~W9&){^Q81e+EY7%~Rw2H@d!t6DUV!?O z^Zu98ogBW`2y7|`t#>kkYt_3s#vZmc82H1B%P$ka(^c|=KOM)+yC$q!0alAYR3ng6&5TF*SW(S)^(xy zJ-eAdUy6Fm9f#%5-o7}z?ejtl9`h{izC1hmQ)lNoUS@pw;DLn6!;Y#wdX?v@{$F8T z?skMT;>TIFrNT`$hb{Gj+r6JNKie-q|G&Y4^CFFY9a4OA1p;`M{;Foe zrsvG@PxjZp@+rKng17OY2xx_m$3{l$tm#pLEVuZZ)(Shl;o&$VyTDfQ!R+{r7CkGLh95Y` zuDtl;hBK85mPYLOcA97F%?TG(!(WSmK?Z4XtPSW2Q?niSo4G6u9B`8Dw$Hw7v;`9P6Hj zzgXxWq@E&CV(0Mh|JTpQGuT;lSzcV_{CUvjrr;Nzlq~tc)9czU&+EMSSDwdN*5Kdr zXYX{moF6|uJ)OtCE?_;=kDs!eF3g-exqHFs6+6FhO;5dZz?(}oRovji$2rQ{OB}>M zD8`3$lz(f!*wNTo$#&R-@r1a@qtBm@KChS5+xx>@qlwkzvEi+k5-plv{xj_0Eb&y7 z)zkX(b#~*!yX=>2PW<_;&HUKjMqHF{@;P>mYy0>9KYHMp#*q(yZL_2t>`VDoPAfC* zv~G28;axLB{6u@_#Mw=DfBzjaxRK_VP{$Y>GUM~Y=Cqm2C0x^v_;Y=0VqzDV5z!$Z zd^IgFjbU!d(!;BIF8k-)Y2xwG$vM1SiuJCP-Sb-?KJaIJODfh<{MvLG&IPlscf0<=(xFcjSKUu znge-^?2;cIT7L89Z@-)weuPbgTUwY|bLxMGQWuBKvI;i0K1w`!`s_br(f!SCY;E%4 znQ4|8|JgShE1c*%aEp^M-YDbb0RxYGOLdWs1*zfl>pPmK?%nx+>ciXZ_Y=&lrS+NF zt$!|m?UC`J>8#>%=TG0Bv$q}OdscV%fB}C;=0m^M_c0=pr;m8Wu(#ZZ)*`{T#I&3Ql*(=Mma=hsWj_~)R-E0*TRCYE+< z?uoDORgcJNo{i*D@X7krc(y5F?q7y;RSnkihfDUeFWjJ1CdP78CcvHL$nvLaIC7jV zS6nvSwX=ppbO!TP&V>(iI5NIHzMlW-QNzpg{A|niU-(_#_F)bCiSPOIjSOo3XtBL7 zQE2Dj{t#A?rzf~dH6)Lqz3Gp=$@{BiQ!fsg$&-zX%cB&H;!9N9l@Q>S@1*_zgFD7#nPS&2uucUw(d_aSglN-M_Ci*$?NlDemcCMY-T$7l)n=RagPOJTrRECe$O@$FPB2#5qm(XL;d(xa z_ul#Sy^=pvSS9xDJI{LBxbMPEzL?DZIgtW2FMm80_h^25H2q4gvO;0Rai=D6!?*Ug zZYD^~OHfF6c2M+c{j2!o&Hn~>HS2=8Hv6@inJ1+E`Q6+2@_ICzfUSs<^p%el|G!ut zzJ7kqfxdQy!|`l>P3PFoHh_-iduSgcD|msm<%(64IOtd%vlTZV9uOCk-giGC;{RW@ z!&mK@MA#)&H!Iw*QaJMFt3&yh4R31>*jP_NwwZB-5aRx!Wp;CUv(^s1tUq0Fw%kV9zBSBG!xy4DH?)fcRlrj$7( z7|VWnRg%#CeX+g1K|`90#>xA(|ik^IRRbNuhzEoWc3lsnv5xSYu`-R46p>k46}N$h7kc$S4YpIgJe>9^+H z4!@iTg>t78ZyR{p`q+2XYrgH^_>-0@@Wc6+tc=wgEuLKtJXUwR?tHOOvXWnLK(fnw zqg%SYM4PaLi0p*l=K6+r_LoYk#zZ#A3RJ}~x%jcOJP8Q0QoQn}rr}N6(}c8u&BBQi ztT&t;9J-24GTfXS>=Yf|p5s_qK5>G9anojIC#QDi@CAI!`am}sJvk=7XnJ(wXJK0_ zg%h6cPIIR>#`q;N^nDg~32D%&z}B zqXIk&tk8O3x4FK=i^|L9d(&JUzE}Q97EY@udBhaKL1UZ4`(Xr;Iyxn|=`#@ACCp3IQQH`rj9lM;~j?}WmK{vXL7 z|Nr@#n2?^7`s4fc{*?5-6X)1^&j?uhHAtsMJz=8I z>l;>zpraP&^3}-lm6-qe`E~xo|NH;*6tT@%-h04G<-g^U19K-&y!A`!F1yjKcXGUp zX9O0Mv$Nb}T_C(!;fM9n<>`%9GXERDn>uEkD4Om5{9f|j%gi@<>lf^8m|rirsJ`F} z&y9#1k~=J18_5c4TKM+bg3OZ=cDnfF5v+O~OBf=Kz z`Z%-?vpw+rA{|)E&NKOcedEM$|K%OyjSYUQo^6GUXh*#)HhgBHdA-i48~ZjTIKE4_~sDy;Ru7!t%NzVfNDl(;w9R zZxA_j!%9J8s_uNl8NbU}&h_+^IY_u2%-~39Ip9#{a6y*Y`jGffjre2x?*~q4w31X{ z3~*;wYdq7|`S4ZEf^v(06D~+6u*JEZIM}%Je4p^HNz=MJI>my*pZxvxeKuo>ILC?j z7jp$ZOwx9{q8fg9rEt^M$Bol6{{8=ZnBh&}gR?hJ$O_DGs*#;2xcT9n8=ndcN}b%S z-G@-7)Vta~k^!=0oQW9|E2C;q$8HY*){g zz7qjAI{rO>9$q1G=*9vrK^2b0k|19MXtJ;cv$sS|>{|Po@l{4cn&rPg>i5NBWCc=$ z9p?(h7%M-C;CIjV_6^Fv!X+gn1}jS7uC3gzYII)06jQS;A#|GA7;1b_aImtB)za*f%)fWNKx zlUi zTB&!PlPK08D3C8<+d4ivm@*t7HhRK}Kv zsWKa``ezFq`1h z?-h3yS>I0J*?Nw{xIoyJyI}w0dN#ffnvqMEfiHxcUG8Ph*44$BlY^JPm7M zs$O8FxFC{0;JI^W{+12$jEWA^`8Ys}#cVDt0(t4g@8jzw>gxZWJaAI)jDl_wW0}>` z&2lGR3S41)IQ>BaLt@dT=N>ORc(zU6kRZ#SWF@=fk?0jk$+sOn*Sw#!9hmMfFR`!Y zpMegOz|PMf+q-1>BOXk+#Mt<kruS)&EnpQt071-?&-E zUZQ2{KI09a{~VRfKjFQRr_or+d7(1X>zV^Lu72t)ataGc$`mo*Ri17E}?G83SlPGmZ=k48#^a<+%;T0SKyKnudcPy;>~i(+nkaYEX;|NdE8ti+Sqz?@LU05V#=A zp!r)vK$61g<(m`U*1Pw=Tbg<7|Hqf2%sD$nO?8`QT3SgTGT`#yU^FXxP`GS(QyO_IB!q>x=<0CV1bPc;wAsCG%uyFEX_4Fe znK9_|PgUsxu_x9S{cQd}*Nu3aFq`+_)t?NO(W(2hSGN@Y?6FwOrtgIMVjIU>>LB3rT?sYuHs!ukGk`zTj4x zC)j$iDaVARgNyNktipm?1!v104s-j}%l8>wNV>*s8RMXy&}gauM<{= z+uwV@>z9^LJwx)wmA|JxPJOubgLK>aIrk+}cB&qzda^^ogqi!%q+9m?8)Rqwf4^bY zN$r2#j4g$c9jjlyJ*swC;p7q12N(G)-73@_%l{+`Ftp83IQfoMcW+XvQm)U`i96>t zHU`d46qz8%v_bkx=gSEiPTxy<-o2Ob&GJxmn9RrVqV4nN1H0{B2wqyC8tHRpjYw>S z$2mKJn9Xtu_R645ND2&dSQAqpF4OREkQK;NEZg+GK4Ejsjxr~K@ZOsg_42o>&}}l$g;tSKt{x&;Nh>S(EPEzVT7_=pplO_7YZ#YYsR^bnJEbDBrBY zoZ%^^*(qA`pZ$ee$s{3*4WAj`we*N7U*T@7zQB0%V(*j1E4v&xE~Ic?`#XF3OR*0N zR3qyfPj5;Pn^atEWi4)eczgd5U6o_kKQioOjDF6n@=w$vRR6$X+ZRGl3S#??9y({D zkm!5<9Q%pp4Yq2FjTINC+8Qb{M76n|zkOk)r1qB?KN)t4S3YZg(#L*+;X>Ps`U!qV z%=HqUJAX4|R-SOWWoi3|AHTKP1lUSlDk9w6ztsvn zp1yzozJ(gfOO+4t*qo7Vag@GPc++*oW5!GEt3NYN`u+F0_TlUD>ouafR8@{2J#g@_ z*ViMwuUdM(+`hb0aK!>!`7Lo}t!L*dSUZ;WzvGnD{m$9SAT7;)IN(h~&A+1uK74r> zzRSfxSXi1lQkH+h>wiq_oBk=M86+6XD@?4nuu@dWeP3^%^yBOY;WzenW)B=hg^k1Z z|NC|7%!kk1#@B*39;lZ3&?1l#-=T8*fX-1S+3nt0Pe9G4nF2{)1-Jf`nVopxuL95F z2^o%D~X}Tde?>BIx)ON9n7HZ|XgaRd#%7PIH{_)IpX{fNgHh*H_n) z+xY$C5_62)&AGQdXPz#5zhN`z61D`N=V#>4_odl$IW>eypX)3Y%1Hj@P*Ue6eD(qt z;|I4diei}y&K(!FDz$TP{QT{EdRy&zeq({XceupnWz6k2S6cDgIbp8Amj}-ie;zz= znCoTD9`;**AG|JZbuVpW zu!+YxMkdQcH#Z|^(j9-KIK2y z$7Z&-#Y*15_KDunM-P%y1*SY?>Z|*k_{06A=zfc&j+f7k*{+4pmaOak*_Y;Mt0^uow}G)qMU*dFYYVDp>wy?KI66!rJ*J*LI` zs%66LOOC%CUrhBrG54=SnY`g<1(kfe<6;c|*Y}A*ZZ0d~VO)0cf?Es2i#lGrLcU4O zE!{J>+-}|fuflhd?1FRb>hdY?*@d~4eHZ6g=p0@2o$bp(gWrtaBF!gt7pIJ7H;reL>dplAoey9{m4*tw$^pyhOHyhjCSj1KZ(y{8_D%_8XWF zo%8*3%H+ZscJa^dlh&xGf@Yo=boVwz9ysH4+wO6}4A#WNqWn&YN zOL~_s>03BMQDNDc!yjI~6K|Uz|NnwcMaNBUrrX~e-*7~oZ)kYKbhhb_@MNh?p2-XP z9?0r2vdv;;yvuJiYr8w>ijRgg$9sQk3^kZJw!LS5vO`|J{_>UH6Lb6b`{XRS?RxAD z`x&9U2giz?)WZ*6aY}Q#XW+q*AF@2G!RG(>-euwy?04z{ z)Kk7B9lF?5Y|zHAruk!q@{!UOE15r1JUlh81hy72HXHe^yu>J(GyD8X!AnO@W6O##Yh-q-9p-mvFQm(*tY`#bgtKQ)mHJMo5nA0J1C*b{r^q)PEB^_Dx< zjtP8AzHZ#p!*k{BgQhgcf6V$CE_?~A&ervaB`;PqkZ@+Wa#CU2;l_7$Pa*|pNN)Nk z5Zb)N*{Lu)S0l$x-8{C@N>M)kU&4SS9-6%aJMmAj3xd#a|)X_yYUYbov3Hi z7usqVXI&$07xu+~l8dJ9F!Q<|{vUeEw-?Q*mO}-vdHB7Id?B zdY10FkX-JV)j5lmF;^;)-5lrR!Ro{c?;ZIKJlGUu&$bZ>t&n#E=}2J^_DAV zpTEdETqY&B7Cisge{rwa;+4f3?FSO>vwxc0_S=4fwfq7LmCA3-OE^p4 zTQVEYKJR!dVYB>(EzYNOI6TgGzn`!)Vu2sWr==}VWc;08r$$^kCqE%lz;VOIl)E){ zQ7OG`2NL)gqe^Wq{N;Jw(U5Ur%?XB57mZg9d+L7|xu~QCsJAfhFqAcsZrY>Ya!FDk z-~p&sNsXBBS8fi^hRf?du3;jychwKsD<1`dA1JSS+?b>I$!JaedqLig`uF#Y4LBX$J6KrVyoIFN z4kXNDWZaos!g(#@le!3#O$`&z{<^;j5@h`@S>e$q8=|W;%Ajk5jl)cGALa{4LGXOSim`;cdJqpkT<-;-VrE zXH#qN;NdsPw+B|wFR^Hv9yOOg;DO-g|ID>NMT-^)ziV0GCYT}C($8pg{=!DuDNt{p{h9Ce54_nAHN{Kb z_`k6!UGLwYKgU1(R!{ly?!5kqogWkoC)7Prb)0j7&1ln&@9XDx`sFR?JN{mJyW~Gc zYk37?6DDarO)GXiw{$W>!a z(1|R2s*MYdf2#ZEI{(L_qsKlsdSz~i6!5Z=cg|O~Qa=3u|NBPiqn7T*KQcIY-U>+M z%;k^BxU^B&sf;~k$(#QNrXITaUor12YpI6D&FT-lH#i?YdUkZ?%nR0X2CY6l|0NxM z+^>JMYJt6nu`;OaI{uMws*Ii0Z^J0*-ZqAxiVU|V*vsr@MykI8~pxK{y`*{3($rQ;Q?5UUjpI2Zkx$e4ZCvS<4p|JAh z3^RG&#)a}s&09Y+az|Q~I-NLoRyp%O``X~&-}UDgL@~aq`D0TgWcRvp-GtVk@+Z$R zm%7xwxp)4<^LKv}1E=sFd2>90e+OvKUev5B0t|22C09(|X!n0vZOy?n`+vqp#sR4> zMU`d6?Ht!SZU6XqxxKQ|!o_8F4&`fWmUr%#bpH-2V7Blz9=!L{;ay9^9k0V5BxL<0 zSZ=!jYjpsMrgS?a|0+i1G76oqGzg89g ziZd(2M<9~bJG=~{Z?%ur@1s23|@N7NDuA|~`dgF>(MWrimE=o>tobk}(WsSqD z1OIt+eEy&K#<@bcsb&d>bKgRO*Zrt-O3P?mL8qDz9tz`Nnqr}JHXSKt< zeKH$Q{#T!@5c;>TPDpH{vHXcXhO8?-VmRD&N$(9%b(=wQd2(KOz>VGaA@w_ z*@+u;4?lV!EWLJ?n{&e>(1FNL)cZCHm({(JS$+1*8Nb=**mYWFHeA&Z^xn83*1^MI z62})Khf51oBcA9To|N!tQKp|_Ia`W?*&Jg~oic6K7A{7q_e&ReAGx?d*vN|6=)|Tw z`AXAc6N}BHxl_AWwqL57aB$0)EQ7O6J?BpJTw8dBhcQ5%rNru50B>kmSX`Sw&;QK# zHEC*W6Sph5d{yt5w^PAMQTe$)+lAf-K40z#_$OujQ!Erqaq!zM^|q!*Y|fT9H9Svm z@<;4wn3fn=sd+7fJw+hZI%s-a;BH~2{l+O1#9eI;y=gwx+MLOj0=nE%ZfO}ugWvH* zsp>6Z)eaUGE)q9x{E&#Nt#_X8a`5Y9_Vu=JJj@p~{}S6_a6>@odblC8|F-aXz>~-c2Y3A8y7F_ulXId`qDFU=xR~RbK-X7>E!x7x7@+Rr6xEohai*VXwe~-wrco&XBw@BeHS&7r}IfwcqO% z+HDs`3Pc=l{!wkWVh3j}$cqn_gmUn-FAYDD==?Nt0w@hm`s(n#_RqqEpQ4-0HD0zT zoNxM*JY6P)^>V`7ng%9L6K!u5DI4@h<&&y7Eoy1*+i-X7)FF zaXv_mc+mUu$Xjm5vgh?Trf{_OrKct(Dx{gUT>EW5VK3t>)`MH+S+4zLxLDF}{$S&7 zkYP`sfzLh-nZv5MnpsIh$L`VN*TS2PLJv3mwJyznv}lF!r+0rBbl*RC=Vt?}*a~I? zfzulu%KFOe+*S)zwKD8YbGGQX)516FB}1td=z=TNaORmpJN7B(zH)ol@nD81W2sfb z44HCc#_tUcUuu8-Wp%aAFl%XbaBq=2y*|K7F{9eiWB%6#b!Uu>T6@G~7Arc;7LZtV z{GAXNuhzMyo^uU6lg_ZuVqCZ__{7_m1Ad2poz6GXa7x!Gu}ffNjp}ke@5gas-N6li zvbXR_SAtGD;8-Xr5OJLO%FhGa@4UL&f4!tvrswR71?SiWl*`RDUY00Sw@rMlKI8Q9 zuATo`wiwE8)8VdlJ2HW<+WrEwtO+wyR9EYrj}j9i`DYw<@LunxFDIkB%iX!*i@<_Q zIwvyNTh1I|zs2lywpQW)y*-OP%@|6ZEF%6-DDmg0ki4c~Q8&G{x6{#~YjUE&yPpTd zBfq=?9oOiV-FHv`bXi^2d%=TcBKjL;`6F(06khnACci(4xZ&_pPO)LZ1Q$td|2Re`(ppU<8|@BpT{g0EWMnt^Lg_f2ZmCox|*t^A3huBy2ZPHujvV! z*R0FpAS*aww!@e8^X(-L{19(B_B_lijg2ivJ@Mn|LgPJqzscUnNM+8~lJDq!`lMy^ zon*^4_f7q5u}Z9^E@vWDB^-XcIQ0Gg`<~zTF2}nP2J>T!&m1t2GXBGU_wT3wGOT66 z0rtIRc5d9~FA6NsVM#c>;fJY)QG2S1+zEcry@wa;)7yLmnyeHR{yf(gW?tBL;y>do zM#i&M4ex$PWNntaA;g#y&$iWC@k`t@(VGj(!D6 ztY&Wi9oHKqr9NiRPE2gSFej&nC*D%S+AX|CxWfK8`>$h)8TuR~8QRwP)Lfp~R`__q zs|p2oHPBTOQ_i&=@VhCMvwdCvwY0^G4n7S{yg@x_o4K4^F??4PJNZ%@K;{p@XwnSotv07od?r8PvPaXUzS!bFGK7HVeuuv*@Il%jPJ`>OW zeJ70yF7Ehj7-S{)LXbOp8tdZ!fBtZVF)f~GEwy-V-$kPu6BY@HmXMzk_wN4lDGO*Y zTiDH*?^^%$G4I`G;VmNE+vJ~Iw+~zJ*M7w#wzP--Dl?g1)p!^d^WS>HGLJXWU|F7f z%9h85Q8hdv91Y(*c)nj)-XwqWT|>`3)+UeGDd(CB3O^h1d|_g~v1v^`&m5jNI`tA3 z4b^{E?6noV_L8CXPQi`Gj=i5)ubq^5o6~b`s&AWQqJV^vqQga_{}(53Q26L`Qm13X3=wAG49;r`9!B;1n6E$nH-V|#q2f#ELA_s} zKg%DMe;{ZoFzW|z*Mf6wCl~_Un^`N)oXu!Y-Vy@o7?`s-{C1F#I5D5~qTrR38{hwY zXmDj%A-t%>xxF#+7vEuP!8huU1$X~%zHyWP3-5Dh&99DDN($oA&EMPq{Qu8$^=Hq4 zrw4nY5)9om&Km66pS-0(lDAP&lu4x2LF8(wO)^re|D zEfN`};v5?VzkJ_q5~0~Wi7AGA2lGL`I}18er%J2{Zp!Wwa zz$VGL_sSa|eA@qpy^bw!+I*gVR=bH)JvQ9^t9V?wGx1tNe39#<=LdhgO!#wxV~=~w z#T1jty=?~`@H9@`@P|w6lfwR>4T7~_l$^BG5-$Yl1ob|C@{l=O@Nnx#MWaIKHJTZMObb#Yrp(~J#cp)L@bfQqdFBm2XBNH zOQ~JLW_bno4I0`#(>TH7QHvEFwhJ`8Wj>g$xZJ>+S#_?!1*0{MeV5kP-+1Wf@UDa7 zPlEajlbFr&3u@&SNb(09XTEK?`>?L0ao@SRo@qYKmMj`Jv&uYN-#Ns)Sb!|vS(6mV z#{J>1>Yj%JTmCaIlQv;C5;(o#g0;Mi9v{zy{6!YP^BACeLSKpB4AosDJg}eUAkCP0CKKye0q0F4|&G~_R(iww* zfc}G>-q|gx4l6J6n1cpd4Sbv$9_@bS_PsG-8B3D2;-N>EG-gGbhDg@QS$b|?(t7Ww z#M!G*2N(n>I-JRjP}ts><~VPj%KJM98t?V+71>v@vs_u)pu2z4?-Tr-|N2*KJg|_# z#_5N+dY3{`ddiU{QO7{XadDbTF&$QA(YVLV6xGH$i&fHBXa%T`_#nEk)#f+jWzN~G z3*94%!8A zN3(uPfbMR71X|GA*vP|}^sTAk4*RPXhrVa3cegfY>T|4MN;|aqx6GBF34s-j4^K|K z@iRfoy6ZHR@5Booj&~IYu5mJ+ty`eKziB4JEY`&BhRZ#bet(}m z{o!|YUbZK^&kedkXWLd*!~A2#(lL{jacAHyrQl zx%`P|1!sDITgA&1g_$<}TRhR#g(Kjt#J!7=0(TbjzG|^aEKgPV)}j-j-s0*!brq+? zou5C}9Q^Q}|5>XX=nAdVU0|;r6k=KsDZps7aDeGJ2pZ})MWxW1|eZ}X4 z%j%_-1>9a;S`E6N^i!q@3tJ?|3D$r&3ad&%1E(CvS#!)>A};nUNV*WDlU3rBuvu<@ z<6QonX`ohRH}vvbF_0Aj?ky7K6K``CPTG3eMh zQzocA-6IvG$Z$*Ea8lo6RpX)+Re}#+=x{uY5V*$lO)9l9;>MIl#+Hv63zrBt-T8RH z>^0-2Y3jC(i6!@sXB-4yxMU#V+;C%Qgu-_It$rLYZrsg3AUPqwKA`;Ws3jENW-^^2d_#Ro;ZH5X|R%8{JpkE?J^`xWtij}mcOn0;kt+W z{@s5^KD_&uK56fk_dgZe!tL)}P}Ojl%b)h*Sh3!-`8=QQtUvgzugq=(yS?&adFI0} zKJH%3dNqK%vEN)mVqFQ}`3mMzhZP%Gx?jl(1Z2#&-q!x`@a^e~CD}At9Na~vBXHUTuVcqH+y1Gy0b&I)4DzT&lNm9Tso^oaND`#`S;{`%9rjp{!n0Oz_IA2 z)vccfiJ+_}7U68g;?Vo`;WfsENi7#r*jS$IySOx>BjV7mFI`;|f3Sm=(s)HQ$nws( zxY&D*8~1y#g%5?8mYi#8_~UzSl1@~K(}q&JeV(-`Kh%16e7Y0*NXcf^p441Pm7Ol` zC67{5PDz~IvslsKi*v$`vrQ4_mq*RHu!fnb=;4bX9X7V8ayz%v;PZeRFA7L#DmwV7 zr!25mdNG&(!W#A!k3Y`-uI{ykb5m{Nhp9hLFj!@kFDbW^aGM_2E0%Rwm8I=+oPd_z zekNCaUuy;By~0jk_Vr&}lm^YL z>0>`plgpUeCg2**ru*+Z56}PeJ#VHMfZDH|ZP6S&?U4dn<#rB%KA-tGPE49;0luM0 z*BN{!g`0DOnc|1X`pnELl$jQt+}L={d$U7(Orw>2{X$v3CriUlylXABaWL`u^MAju z!?VqTvr3joNX-1>w)t!Z2hV;1i&++1{<<7p8or@nfj2u#%1sYQx5xWDID9V(EU4uO zFp_2}y8C^*z2v_A%{r}0-+sh7ZC3i2`8Al>l8mQ?wZ;(<+oG8PQIPapZ@ATVG@d9XN}}v zF7SxyV7Pspam}+|EH-Z6)tS2=@UvYwb9^iRcZn@5Qw~IJVVU|c>SL*uTN!v2SX5e1 zgFwZW#>R&qk1c!}C{=3b(CBcTkK@Flhc>9TCL}mD%#sxhsyT4*%mD@~EeV(4+s~Dg z)j(HtMy2&E09^npAXR3^wuG5!Q;CJ#MQczrz}%ehz?or-{*&YK59B7sZz<*0wU#@f zCx375gp22nXUsHYa!$}Famu*!li{e<-E@Zp&s>XAC%67vvbt~sKD08Jrn@E>%WUWt z%rt!5sLk@f+3%QC-ty$$d1aCfNW(|Nw<$EE#XSkj(k z#d5Z)A4R%>~Pul?l&c<7}qE`KC zX%%~zWL*C`qe&VxCJnyFeSs54f$n?@sXlOV10xa?H)LPeTXp-aiPU_U7`RD+N;s?s zof_V=3{qV{lNs1pD8bkUY91&-d7$hFw-_Q;rf6WrY&2^HG$kd#vl)!_LJWKc@e%OU zu>q>}5H9FcXl9&_Jgm>+mhRvd{1sQ|Fx+)Y03Bv@0}%`8ENg|unK1XD%Q+|fXl3xt zbF!cG!gf{|LUx59lgW<8GLs~PkehRYf^)-1dx0L%(l^X#g1Yd6GK<^yhMr}cv4kf$ z1Q~a=9spe(wXqjDlA*dG#+Es_T}Da(C~|EFK5#dJhO9$uu>~hc%wan?Ue&gZI-#Lw exQ7BGgTv?PUiX;S>||hIVDNPHb6Mw<&;$U%Uc4&+ diff --git a/examples-switch/audio/audio_multichannel_sound.c b/examples-switch/audio/audio_multichannel_sound.c index c778c1c8a..7aa7f4cca 100644 --- a/examples-switch/audio/audio_multichannel_sound.c +++ b/examples-switch/audio/audio_multichannel_sound.c @@ -14,6 +14,7 @@ ********************************************************************************************/ #include "raylib.h" +#include //------------------------------------------------------------------------------------ // Program main entry point @@ -25,12 +26,14 @@ int main(void) const int screenWidth = 1280; const int screenHeight = 720; + // Initialize resource directory + romfsInit(); InitWindow(screenWidth, screenHeight, "raylib [audio] example - Multichannel sound playing"); InitAudioDevice(); // Initialize audio device - Sound fxWav = LoadSound("resources/sound.wav"); // Load WAV audio file - Sound fxOgg = LoadSound("resources/target.ogg"); // Load OGG audio file + Sound fxWav = LoadSound("romfs:/resources/sound.wav"); // Load WAV audio file + Sound fxOgg = LoadSound("romfs:/resources/target.ogg"); // Load OGG audio file SetSoundVolume(fxWav, 0.2f); @@ -42,8 +45,8 @@ int main(void) { // Update //---------------------------------------------------------------------------------- - if (IsKeyPressed(KEY_ENTER)) PlaySoundMulti(fxWav); // Play a new wav sound instance - if (IsKeyPressed(KEY_SPACE)) PlaySoundMulti(fxOgg); // Play a new ogg sound instance + if (IsGamepadButtonPressed(0, GAMEPAD_BUTTON_RIGHT_FACE_RIGHT)) PlaySoundMulti(fxWav); // Play a new wav sound instance + if (IsGamepadButtonPressed(0, GAMEPAD_BUTTON_RIGHT_FACE_DOWN)) PlaySoundMulti(fxOgg); // Play a new ogg sound instance //---------------------------------------------------------------------------------- // Draw @@ -53,8 +56,8 @@ int main(void) ClearBackground(RAYWHITE); DrawText("MULTICHANNEL SOUND PLAYING", 20, 20, 20, GRAY); - DrawText("Press SPACE to play new ogg instance!", 200, 120, 20, LIGHTGRAY); - DrawText("Press ENTER to play new wav instance!", 200, 180, 20, LIGHTGRAY); + DrawText("Press A button to play new ogg instance!", 200, 120, 20, LIGHTGRAY); + DrawText("Press B button to play new wav instance!", 200, 180, 20, LIGHTGRAY); DrawText(TextFormat("CONCURRENT SOUNDS PLAYING: %02i", GetSoundsPlaying()), 220, 280, 20, RED); @@ -74,5 +77,6 @@ int main(void) CloseWindow(); // Close window and OpenGL context //-------------------------------------------------------------------------------------- + romfsExit(); return 0; } diff --git a/examples-switch/audio/audio_multichannel_sound.png b/examples-switch/audio/audio_multichannel_sound.png deleted file mode 100644 index 4b98b26e0a05f517b5f157d7cf50ba2424866446..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16088 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 diff --git a/examples-switch/audio/audio_music_stream.c b/examples-switch/audio/audio_music_stream.c index 9210b4874..97d16b791 100644 --- a/examples-switch/audio/audio_music_stream.c +++ b/examples-switch/audio/audio_music_stream.c @@ -12,6 +12,7 @@ ********************************************************************************************/ #include "raylib.h" +#include //------------------------------------------------------------------------------------ // Program main entry point @@ -23,11 +24,13 @@ int main(void) const int screenWidth = 1280; const int screenHeight = 720; + // Initialize resource directory + romfsInit(); InitWindow(screenWidth, screenHeight, "raylib [audio] example - music playing (streaming)"); InitAudioDevice(); // Initialize audio device - Music music = LoadMusicStream("resources/country.mp3"); + Music music = LoadMusicStream("romfs:/resources/country.mp3"); PlayMusicStream(music); @@ -45,14 +48,14 @@ int main(void) UpdateMusicStream(music); // Update music buffer with new stream data // Restart music playing (stop and play) - if (IsKeyPressed(KEY_SPACE)) + if (IsGamepadButtonPressed(0, GAMEPAD_BUTTON_RIGHT_FACE_LEFT)) { StopMusicStream(music); PlayMusicStream(music); } // Pause/Resume music playing - if (IsKeyPressed(KEY_P)) + if (IsGamepadButtonPressed(0, GAMEPAD_BUTTON_RIGHT_FACE_RIGHT)) { pause = !pause; @@ -72,14 +75,14 @@ int main(void) ClearBackground(RAYWHITE); - DrawText("MUSIC SHOULD BE PLAYING!", 255, 150, 20, LIGHTGRAY); + DrawText("MUSIC SHOULD BE PLAYING!", screenWidth/2 - 150, screenHeight/2 - 50, 20, LIGHTGRAY); - DrawRectangle(200, 200, 400, 12, LIGHTGRAY); - DrawRectangle(200, 200, (int)(timePlayed*400.0f), 12, MAROON); - DrawRectangleLines(200, 200, 400, 12, GRAY); + DrawRectangle(screenWidth/2 - 200, screenHeight/2, 400, 12, LIGHTGRAY); + DrawRectangle(screenWidth/2 - 200, screenHeight/2, (int)(timePlayed*400.0f), 12, MAROON); + DrawRectangleLines(screenWidth/2 - 200, screenHeight/2, 400, 12, GRAY); - DrawText("PRESS SPACE TO RESTART MUSIC", 215, 250, 20, LIGHTGRAY); - DrawText("PRESS P TO PAUSE/RESUME MUSIC", 208, 280, 20, LIGHTGRAY); + DrawText("PRESS Y button TO RESTART MUSIC", screenWidth/2 -200, screenHeight/2 + 50, 20, LIGHTGRAY); + DrawText("PRESS A button TO PAUSE/RESUME MUSIC", screenWidth/2 -200, screenHeight/2 + 80, 20, LIGHTGRAY); EndDrawing(); //---------------------------------------------------------------------------------- @@ -94,5 +97,6 @@ int main(void) CloseWindow(); // Close window and OpenGL context //-------------------------------------------------------------------------------------- + romfsExit(); return 0; } diff --git a/examples-switch/audio/audio_music_stream.png b/examples-switch/audio/audio_music_stream.png deleted file mode 100644 index f8b14e15937cd3638cf5eea0ed7ed5d21fca7572..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15043 zcmeAS@N?(olHy`uVBq!ia0y~yU{+vYU_8XZ#=yWJp1k%11A|qUr;B4qMO^ZqUteF> zw*?wVF)dcaL6mSXF1r{Y$J=;OKmselSk-zUgFVG$ZExFw42~Wwgh5Z4gPZU{?2*GaR-HNW5+6QQL;o4Z9$2*oe~&ASYbL;l7@>10Ntx2pM&POg9YOWlXef+^0<3v6nifXW!f0ARZtIWch|wG|nj=PY1bQEP zv|Jc17e>p4(Q;w5TmW~a(TLH~akO+CEgeToM`BAy1;v7&pHkTb;~yw`#9k{J`1v-pZ%>Sxfc5d{`2`OLlF&n{$E*i(48;&$))4Wq-g% zV<8xKwH|oEb0Q;2nzvC??vrN$we)vO85xZ+VvLFFn~6_HRL0k$P#% zoQUd^U(MG(YLENqkYDXFmvL$7pWZMR@Whm|Hj7)jgIn+)wBi%aWw`5LPyL% z0n5P0803F&p~;PoyU|7wX*wrL-@lM$U$Ruh>0zt3?S$3+6JEa%t$%XM`L%7-m06sQ z<#oM6$;ur|%W?R!(tv)LB~BxWiaSTP&T`s5CdU@XK7F{Z`F3X3~)O<3HV8x{#D zd=-()n)|IeTdn!lawgs@nqgn;L_4npFJZgAGWbZF_+Ga=nWA*SmOsY!G2gDoD+k;;s}5?P&oz)=NmY~+09yEaVFOI0jHfGkV1DA z&I~h}89f{g}UT$InQPpzbh0vOd zOANsUE*4^Rg#sv0s1OPlbXg?!*ZuufZ?Xp*^4Rl1gB&EMp2IGkV8Q~bsYY`uxREnj zZH-o2;9kOLwI%60ni)nj!)Rt0?a;8eIgfT|Mw>|oGB`$i_u!5rsMk5#y9W)Xjy97< zn@OWXU85c7(V77=%s5&zjE*LaHj|)J9;2CIG&7852C8KS1_minF5N7pThR;*3=E#G KelF{r5}E*g>A$l8 diff --git a/examples-switch/audio/audio_raw_stream.c b/examples-switch/audio/audio_raw_stream.c index 7c07975a4..c332dcee4 100644 --- a/examples-switch/audio/audio_raw_stream.c +++ b/examples-switch/audio/audio_raw_stream.c @@ -82,6 +82,8 @@ int main(void) // Position read in to determine next frequency Vector2 mousePosition = { -100.0f, -100.0f }; + const int GAMEPAD = 0; + Vector2 thumbPosition = { screenWidth/2, screenHeight/2 }; /* // Cycles per second (hz) @@ -108,15 +110,20 @@ int main(void) // Update //---------------------------------------------------------------------------------- - // Sample mouse input. - mousePosition = GetMousePosition(); - - if (IsMouseButtonDown(MOUSE_BUTTON_LEFT)) + // Sample mouse input + if (IsGamepadAvailable(GAMEPAD)) { - float fp = (float)(mousePosition.y); + thumbPosition.x += (float) GetGamepadAxisMovement(GAMEPAD, 0) * 15; + thumbPosition.y -= (float) GetGamepadAxisMovement(GAMEPAD, 1) * 15; + } + + + if (IsGamepadButtonPressed(0, GAMEPAD_BUTTON_RIGHT_FACE_RIGHT)) + { + float fp = (float)(thumbPosition.y); frequency = 40.0f + (float)(fp); - float pan = (float)(mousePosition.x) / (float)screenWidth; + float pan = (float)(thumbPosition.x) / (float)screenWidth; SetAudioStreamPan(stream, pan); } @@ -185,7 +192,7 @@ int main(void) ClearBackground(RAYWHITE); DrawText(TextFormat("sine frequency: %i",(int)frequency), GetScreenWidth() - 220, 10, 20, RED); - DrawText("click mouse button to change frequency or pan", 10, 10, 20, DARKGRAY); + DrawText("Press A button to change frequency and pan with Left Thumbstick", 10, 10, 20, DARKGRAY); // Draw the current buffer state proportionate to the screen for (int i = 0; i < screenWidth; i++) @@ -195,6 +202,7 @@ int main(void) DrawPixelV(position, RED); } + DrawCircle(thumbPosition.x, thumbPosition.y, 20, DARKGRAY); EndDrawing(); //---------------------------------------------------------------------------------- diff --git a/examples-switch/audio/audio_raw_stream.png b/examples-switch/audio/audio_raw_stream.png deleted file mode 100644 index 344f4a71077431c9f50c72e2815552acef26f7ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16736 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 diff --git a/examples-switch/audio/audio_sound_loading.c b/examples-switch/audio/audio_sound_loading.c index 53c15a748..e201e6417 100644 --- a/examples-switch/audio/audio_sound_loading.c +++ b/examples-switch/audio/audio_sound_loading.c @@ -12,6 +12,7 @@ ********************************************************************************************/ #include "raylib.h" +#include //------------------------------------------------------------------------------------ // Program main entry point @@ -23,12 +24,14 @@ int main(void) const int screenWidth = 1280; const int screenHeight = 720; + // Initialize resource directory + romfsInit(); InitWindow(screenWidth, screenHeight, "raylib [audio] example - sound loading and playing"); InitAudioDevice(); // Initialize audio device - Sound fxWav = LoadSound("resources/sound.wav"); // Load WAV audio file - Sound fxOgg = LoadSound("resources/target.ogg"); // Load OGG audio file + Sound fxWav = LoadSound("romfs:/resources/sound.wav"); // Load WAV audio file + Sound fxOgg = LoadSound("romfs:/resources/target.ogg"); // Load OGG audio file SetTargetFPS(60); // Set our game to run at 60 frames-per-second //-------------------------------------------------------------------------------------- @@ -38,8 +41,8 @@ int main(void) { // Update //---------------------------------------------------------------------------------- - if (IsKeyPressed(KEY_SPACE)) PlaySound(fxWav); // Play WAV sound - if (IsKeyPressed(KEY_ENTER)) PlaySound(fxOgg); // Play OGG sound + if (IsGamepadButtonPressed(0, GAMEPAD_BUTTON_RIGHT_FACE_RIGHT)) PlaySound(fxWav); // Play WAV sound + if (IsGamepadButtonPressed(0, GAMEPAD_BUTTON_RIGHT_FACE_DOWN)) PlaySound(fxOgg); // Play OGG sound //---------------------------------------------------------------------------------- // Draw @@ -48,8 +51,8 @@ int main(void) ClearBackground(RAYWHITE); - DrawText("Press SPACE to PLAY the WAV sound!", 200, 180, 20, LIGHTGRAY); - DrawText("Press ENTER to PLAY the OGG sound!", 200, 220, 20, LIGHTGRAY); + DrawText("Press button A to PLAY the WAV sound!", 200, 180, 20, LIGHTGRAY); + DrawText("Press button B to PLAY the OGG sound!", 200, 220, 20, LIGHTGRAY); EndDrawing(); //---------------------------------------------------------------------------------- @@ -65,5 +68,6 @@ int main(void) CloseWindow(); // Close window and OpenGL context //-------------------------------------------------------------------------------------- + romfsExit(); return 0; } \ No newline at end of file diff --git a/examples-switch/audio/audio_sound_loading.png b/examples-switch/audio/audio_sound_loading.png deleted file mode 100644 index 24071ce3ccc7e93f29e8eb9d3655c9d90ec585bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15438 zcmeAS@N?(olHy`uVBq!ia0y~yU{+vYU_8XZ#=yWJp1k%11A~pIr;B4qMO^ZqUteF> zw*?wVF)dcaL6mSXF1r{Y$J=;OKmselSk-zUgFVG$ZExFw42~Wwgh5Z4gPZU{?2*GaR-HNW5+6QQL;o4Z9$2*oe~&ASYbL;l7@>10Ntx2pM&POg9YOWlXef+^0<3v6nifXW!f0ARZtIWch|wG|nj=PY1bQEP zv|Jc17e>p4(Q;w5TmW~a(TLH~anP5JB5enro}Mo0P+_9r?wnx4!qE;M?w$%O)X-uy zgX4lOON86uDianrXNGc)30AX~u3l}e)HL}{f#kbi9Ikd}{(tdPpVDT%@!is`woBUN zH@;%mic5Ie8dQJLy3XCp(mdkx=Zv|wQcQ;xS=`bc+%A8_umWl~!(FF@61EhRjlFFQ zf{G3qNAj1f`>k58GUd((nVes3QO_2JTgjc(zv3ym_d`wO-IHh6 zCra6W(YnrYRDJE~n-~9>gY0pr;^;Zo(6ek7zG3?pJSQ@eq zTle!xUzR6*S0+o(`*JVa`Avt#%7^YbdnQ^3^`Ex=!nOaP*#0eC`B}&Lm$n-2{mj1c z-O^G^kF|f=wg0e1+w_OsTC8Xw1M#D5KM{Tu5M~H6+xdM_ZKTo7y0K@Ot4zy zp`pcb)BCMp!rjEO_1t^^IA_@e&YH)zN{*>I`GG0W2Q zO7P5g2D1%i&wgF3=x|yKW(}5(SZ&`|J*->PE!uANaPEAk z8YaI|dH#`iy^=Z)eR6iGm}_6WHUCJP`O0_8%XU04>W_QLaNUPv@8i-1r_D?L3%!<` zvFqZ@2^Z6jW^f4bfhTH0j6kuAZNA81yFdbHPU-)}4|r#cS`L7s-AWqkgi_;0fd$bV zpa~mL`hzBQ^y&jN;ZNcVZ%T`D=f`A~?k-i)KTMjI_-ovj~?IGK#a((Y%-G48i&c9gW9M|cPx8q{; z{fwuE&{E<_8#uS$k^}`MwmD=_B0C3}-d*6xA+USftSh!$UxNH!yBO|jlM*`g;w4Kh z%j_#9CbMRKY-d>bq3tEO$~oNFCm(f|VbSmIxTo?PjTdhzI-gMoE>aZi!PQsrdE`0` z*;i;4=c`OZ17%OyLKTxm?e9XeX8PwTDU>adn7;d^t+3O&>XW_oP7l3u{!E;u$8pnJ z`~QO5-s^0gb@!~4wZEb_<>KMVH%i>s*;P%gU(zPL^;CG(Q+e=|`e6&OD<*#@&J_#1 zm;bi)kd0I>b(w!hk|D;?C3DAtFNg2AzAjL^UQ<&0rAU9Rk^0_C#){P|OpWX>wBAUN z7j!?Lexyx&=dXlk!MpcJu3ZDEg#00u&@()V2plCz(!7vL$S1furE-CLfu?Nc(sGeY z)z8vQCiA@$Sa7}PQh+D>l4<_Vwzd7o{%3HSN--^I2kTu$Oms@PC_22Em6`QkRMDKH zqm+H6vGtZ&6Bll+_LSv3`c$r@nC-M2bJY5m%eUHh^5zG9X5Mr zk>G87C=SjHE5ZF0Y(5>$4AfX2G@2O(MXP=^Gk{u<-~o)$n!zo2v}PEs8Adb1Xfp}a zJbK&EGnyGjGs9?R7|jfzPBr7eZz&k^6VqkD`jz2i}r)32L0|SGntDnm{r-UW|qH&mB diff --git a/examples-switch/audio/audio_stream_effects.c b/examples-switch/audio/audio_stream_effects.c index 250461fc6..ebc02cbb1 100644 --- a/examples-switch/audio/audio_stream_effects.c +++ b/examples-switch/audio/audio_stream_effects.c @@ -14,6 +14,7 @@ #include "raylib.h" #include // Required for: NULL +#include // Required delay effect variables static float *delayBuffer = NULL; @@ -37,11 +38,13 @@ int main(void) const int screenWidth = 1280; const int screenHeight = 720; + // Initialize resource directory + romfsInit(); InitWindow(screenWidth, screenHeight, "raylib [audio] example - stream effects"); InitAudioDevice(); // Initialize audio device - Music music = LoadMusicStream("resources/country.mp3"); + Music music = LoadMusicStream("romfs:/resources/country.mp3"); // Allocate buffer for the delay effect delayBufferSize = 48000*2; // 1 second delay (device sampleRate*channels) @@ -66,14 +69,14 @@ int main(void) UpdateMusicStream(music); // Update music buffer with new stream data // Restart music playing (stop and play) - if (IsKeyPressed(KEY_SPACE)) + if (IsGamepadButtonPressed(0, GAMEPAD_BUTTON_RIGHT_FACE_LEFT)) { StopMusicStream(music); PlayMusicStream(music); } // Pause/Resume music playing - if (IsKeyPressed(KEY_P)) + if (IsGamepadButtonPressed(0, GAMEPAD_BUTTON_RIGHT_FACE_RIGHT)) { pause = !pause; @@ -82,7 +85,7 @@ int main(void) } // Add/Remove effect: lowpass filter - if (IsKeyPressed(KEY_F)) + if (IsGamepadButtonPressed(0, GAMEPAD_BUTTON_RIGHT_FACE_UP)) { enableEffectLPF = !enableEffectLPF; if (enableEffectLPF) AttachAudioStreamProcessor(music.stream, AudioProcessEffectLPF); @@ -90,7 +93,7 @@ int main(void) } // Add/Remove effect: delay - if (IsKeyPressed(KEY_D)) + if (IsGamepadButtonPressed(0, GAMEPAD_BUTTON_RIGHT_FACE_DOWN)) { enableEffectDelay = !enableEffectDelay; if (enableEffectDelay) AttachAudioStreamProcessor(music.stream, AudioProcessEffectDelay); @@ -109,17 +112,17 @@ int main(void) ClearBackground(RAYWHITE); - DrawText("MUSIC SHOULD BE PLAYING!", 245, 150, 20, LIGHTGRAY); + DrawText("MUSIC SHOULD BE PLAYING!", screenWidth/2 - 200, 230, 20, LIGHTGRAY); - DrawRectangle(200, 180, 400, 12, LIGHTGRAY); - DrawRectangle(200, 180, (int)(timePlayed*400.0f), 12, MAROON); - DrawRectangleLines(200, 180, 400, 12, GRAY); + DrawRectangle(screenWidth/2 - 200, 260, 400, 12, LIGHTGRAY); + DrawRectangle(screenWidth/2 - 200, 260, (int)(timePlayed*400.0f), 12, MAROON); + DrawRectangleLines(screenWidth/2 - 200, 260, 400, 12, GRAY); - DrawText("PRESS SPACE TO RESTART MUSIC", 215, 230, 20, LIGHTGRAY); - DrawText("PRESS P TO PAUSE/RESUME MUSIC", 208, 260, 20, LIGHTGRAY); + DrawText("PRESS Y button TO RESTART MUSIC", screenWidth/2 - 200, 310, 20, LIGHTGRAY); + DrawText("PRESS A button TO PAUSE/RESUME MUSIC", screenWidth/2 - 200, 340, 20, LIGHTGRAY); - DrawText(TextFormat("PRESS F TO TOGGLE LPF EFFECT: %s", enableEffectLPF? "ON" : "OFF"), 200, 320, 20, GRAY); - DrawText(TextFormat("PRESS D TO TOGGLE DELAY EFFECT: %s", enableEffectDelay? "ON" : "OFF"), 180, 350, 20, GRAY); + DrawText(TextFormat("PRESS X button TO TOGGLE LPF EFFECT: %s", enableEffectLPF? "ON" : "OFF"), screenWidth/2 - 200, 400, 20, GRAY); + DrawText(TextFormat("PRESS B button TO TOGGLE DELAY EFFECT: %s", enableEffectDelay? "ON" : "OFF"), screenWidth/2 - 200, 430, 20, GRAY); EndDrawing(); //---------------------------------------------------------------------------------- @@ -136,6 +139,7 @@ int main(void) CloseWindow(); // Close window and OpenGL context //-------------------------------------------------------------------------------------- + romfsExit(); return 0; } diff --git a/examples-switch/audio/audio_stream_effects.png b/examples-switch/audio/audio_stream_effects.png deleted file mode 100644 index 4aaee8b3e4718fbc5c6f738b582a353e886ecc29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16323 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 FO#sP1YPtXb diff --git a/examples-switch/audio/resources/LICENSE.md b/examples-switch/romfs/resources/LICENSE.md similarity index 100% rename from examples-switch/audio/resources/LICENSE.md rename to examples-switch/romfs/resources/LICENSE.md diff --git a/examples-switch/audio/resources/coin.wav b/examples-switch/romfs/resources/coin.wav similarity index 100% rename from examples-switch/audio/resources/coin.wav rename to examples-switch/romfs/resources/coin.wav diff --git a/examples-switch/audio/resources/country.mp3 b/examples-switch/romfs/resources/country.mp3 similarity index 100% rename from examples-switch/audio/resources/country.mp3 rename to examples-switch/romfs/resources/country.mp3 diff --git a/examples-switch/audio/resources/mini1111.xm b/examples-switch/romfs/resources/mini1111.xm similarity index 100% rename from examples-switch/audio/resources/mini1111.xm rename to examples-switch/romfs/resources/mini1111.xm diff --git a/examples-switch/audio/resources/sound.wav b/examples-switch/romfs/resources/sound.wav similarity index 100% rename from examples-switch/audio/resources/sound.wav rename to examples-switch/romfs/resources/sound.wav diff --git a/examples-switch/audio/resources/spring.wav b/examples-switch/romfs/resources/spring.wav similarity index 100% rename from examples-switch/audio/resources/spring.wav rename to examples-switch/romfs/resources/spring.wav diff --git a/examples-switch/audio/resources/target.flac b/examples-switch/romfs/resources/target.flac similarity index 100% rename from examples-switch/audio/resources/target.flac rename to examples-switch/romfs/resources/target.flac diff --git a/examples-switch/audio/resources/target.ogg b/examples-switch/romfs/resources/target.ogg similarity index 100% rename from examples-switch/audio/resources/target.ogg rename to examples-switch/romfs/resources/target.ogg diff --git a/examples-switch/audio/resources/weird.wav b/examples-switch/romfs/resources/weird.wav similarity index 100% rename from examples-switch/audio/resources/weird.wav rename to examples-switch/romfs/resources/weird.wav diff --git a/examples-switch/textures/textures_image_drawing.c b/examples-switch/textures/textures_image_drawing.c index f7e7a86fc..688bb7ace 100644 --- a/examples-switch/textures/textures_image_drawing.c +++ b/examples-switch/textures/textures_image_drawing.c @@ -14,6 +14,7 @@ ********************************************************************************************/ #include "raylib.h" +#include //------------------------------------------------------------------------------------ // Program main entry point @@ -25,16 +26,18 @@ int main(void) const int screenWidth = 1280; const int screenHeight = 720; + // Initialize resource directory + romfsInit(); InitWindow(screenWidth, screenHeight, "raylib [textures] example - image drawing"); // NOTE: Textures MUST be loaded after Window initialization (OpenGL context is required) - Image cat = LoadImage("resources/cat.png"); // Load image in CPU memory (RAM) + Image cat = LoadImage("romfs:/resources/cat.png"); // Load image in CPU memory (RAM) ImageCrop(&cat, (Rectangle){ 100, 10, 280, 380 }); // Crop an image piece ImageFlipHorizontal(&cat); // Flip cropped image horizontally ImageResize(&cat, 150, 200); // Resize flipped-cropped image - Image parrots = LoadImage("resources/parrots.png"); // Load image in CPU memory (RAM) + Image parrots = LoadImage("romfs:/resources/parrots.png"); // Load image in CPU memory (RAM) // Draw one image over the other with a scaling of 1.5f ImageDraw(&parrots, cat, (Rectangle){ 0, 0, (float)cat.width, (float)cat.height }, (Rectangle){ 30, 40, cat.width*1.5f, cat.height*1.5f }, WHITE); @@ -91,6 +94,6 @@ int main(void) CloseWindow(); // Close window and OpenGL context //-------------------------------------------------------------------------------------- - + romfsExit(); return 0; } \ No newline at end of file