From 04029c998873ebb8e0a810a016db6373a466dde0 Mon Sep 17 00:00:00 2001 From: LuckyLaszlo Date: Sat, 17 Dec 2022 20:33:58 +0100 Subject: [PATCH] fix sound selector + favicon + temporary debug log for sound in RectangleClient --- .../svelte/api_front/public}/favicon.ico | Bin .../svelte/api_front/public/favicon.png | Bin 3127 -> 0 bytes .../svelte/api_front/public/index.html | 2 +- .../public/{sounds => sound}/pong/0.ogg | Bin .../public/{sounds => sound}/pong/1.ogg | Bin .../public/{sounds => sound}/pong/10.ogg | Bin .../public/{sounds => sound}/pong/11.ogg | Bin .../public/{sounds => sound}/pong/12.ogg | Bin .../public/{sounds => sound}/pong/13.ogg | Bin .../public/{sounds => sound}/pong/14.ogg | Bin .../public/{sounds => sound}/pong/15.ogg | Bin .../public/{sounds => sound}/pong/16.ogg | Bin .../public/{sounds => sound}/pong/17.ogg | Bin .../public/{sounds => sound}/pong/18.ogg | Bin .../public/{sounds => sound}/pong/19.ogg | Bin .../public/{sounds => sound}/pong/2.ogg | Bin .../public/{sounds => sound}/pong/20.ogg | Bin .../public/{sounds => sound}/pong/21.ogg | Bin .../public/{sounds => sound}/pong/22.ogg | Bin .../public/{sounds => sound}/pong/23.ogg | Bin .../public/{sounds => sound}/pong/24.ogg | Bin .../public/{sounds => sound}/pong/25.ogg | Bin .../public/{sounds => sound}/pong/26.ogg | Bin .../public/{sounds => sound}/pong/27.ogg | Bin .../public/{sounds => sound}/pong/28.ogg | Bin .../public/{sounds => sound}/pong/29.ogg | Bin .../public/{sounds => sound}/pong/3.ogg | Bin .../public/{sounds => sound}/pong/30.ogg | Bin .../public/{sounds => sound}/pong/31.ogg | Bin .../public/{sounds => sound}/pong/32.ogg | Bin .../public/{sounds => sound}/pong/4.ogg | Bin .../public/{sounds => sound}/pong/5.ogg | Bin .../public/{sounds => sound}/pong/6.ogg | Bin .../public/{sounds => sound}/pong/7.ogg | Bin .../public/{sounds => sound}/pong/8.ogg | Bin .../public/{sounds => sound}/pong/9.ogg | Bin .../public/{sounds => sound}/roblox-oof.ogg | Bin .../svelte/api_front/src/pages/game/Game.svelte | 15 ++++++++++----- .../pages/game/client/class/RectangleClient.ts | 4 +++- 39 files changed, 14 insertions(+), 7 deletions(-) rename {jeu/www => srcs/requirements/svelte/api_front/public}/favicon.ico (100%) delete mode 100644 srcs/requirements/svelte/api_front/public/favicon.png rename srcs/requirements/svelte/api_front/public/{sounds => sound}/pong/0.ogg (100%) rename srcs/requirements/svelte/api_front/public/{sounds => sound}/pong/1.ogg (100%) rename srcs/requirements/svelte/api_front/public/{sounds => sound}/pong/10.ogg (100%) rename srcs/requirements/svelte/api_front/public/{sounds => sound}/pong/11.ogg (100%) rename srcs/requirements/svelte/api_front/public/{sounds => sound}/pong/12.ogg (100%) rename srcs/requirements/svelte/api_front/public/{sounds => sound}/pong/13.ogg (100%) rename srcs/requirements/svelte/api_front/public/{sounds => sound}/pong/14.ogg (100%) rename srcs/requirements/svelte/api_front/public/{sounds => sound}/pong/15.ogg (100%) rename srcs/requirements/svelte/api_front/public/{sounds => sound}/pong/16.ogg (100%) rename srcs/requirements/svelte/api_front/public/{sounds => sound}/pong/17.ogg (100%) rename srcs/requirements/svelte/api_front/public/{sounds => sound}/pong/18.ogg (100%) rename srcs/requirements/svelte/api_front/public/{sounds => sound}/pong/19.ogg (100%) rename srcs/requirements/svelte/api_front/public/{sounds => sound}/pong/2.ogg (100%) rename srcs/requirements/svelte/api_front/public/{sounds => sound}/pong/20.ogg (100%) rename srcs/requirements/svelte/api_front/public/{sounds => sound}/pong/21.ogg (100%) rename srcs/requirements/svelte/api_front/public/{sounds => sound}/pong/22.ogg (100%) rename srcs/requirements/svelte/api_front/public/{sounds => sound}/pong/23.ogg (100%) rename srcs/requirements/svelte/api_front/public/{sounds => sound}/pong/24.ogg (100%) rename srcs/requirements/svelte/api_front/public/{sounds => sound}/pong/25.ogg (100%) rename srcs/requirements/svelte/api_front/public/{sounds => sound}/pong/26.ogg (100%) rename srcs/requirements/svelte/api_front/public/{sounds => sound}/pong/27.ogg (100%) rename srcs/requirements/svelte/api_front/public/{sounds => sound}/pong/28.ogg (100%) rename srcs/requirements/svelte/api_front/public/{sounds => sound}/pong/29.ogg (100%) rename srcs/requirements/svelte/api_front/public/{sounds => sound}/pong/3.ogg (100%) rename srcs/requirements/svelte/api_front/public/{sounds => sound}/pong/30.ogg (100%) rename srcs/requirements/svelte/api_front/public/{sounds => sound}/pong/31.ogg (100%) rename srcs/requirements/svelte/api_front/public/{sounds => sound}/pong/32.ogg (100%) rename srcs/requirements/svelte/api_front/public/{sounds => sound}/pong/4.ogg (100%) rename srcs/requirements/svelte/api_front/public/{sounds => sound}/pong/5.ogg (100%) rename srcs/requirements/svelte/api_front/public/{sounds => sound}/pong/6.ogg (100%) rename srcs/requirements/svelte/api_front/public/{sounds => sound}/pong/7.ogg (100%) rename srcs/requirements/svelte/api_front/public/{sounds => sound}/pong/8.ogg (100%) rename srcs/requirements/svelte/api_front/public/{sounds => sound}/pong/9.ogg (100%) rename srcs/requirements/svelte/api_front/public/{sounds => sound}/roblox-oof.ogg (100%) diff --git a/jeu/www/favicon.ico b/srcs/requirements/svelte/api_front/public/favicon.ico similarity index 100% rename from jeu/www/favicon.ico rename to srcs/requirements/svelte/api_front/public/favicon.ico diff --git a/srcs/requirements/svelte/api_front/public/favicon.png b/srcs/requirements/svelte/api_front/public/favicon.png deleted file mode 100644 index 7e6f5eb5a2f1f1c882d265cf479de25caa925645..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3127 zcmV-749N3|P)i z7)}s4L53SJCkR}iVi00SFk;`MXX*#X*kkwKs@nFGS}c;=?XFjU|G$3t^5sjIVS2G+ zw)WGF83CpoGXhLGW(1gW%uV|X7>1P6VhCX=Ux)Lb!*DZ%@I3!{Gsf7d?gtIQ%nQiK z3%(LUSkBji;C5Rfgd6$VsF@H`Pk@xtY6t<>FNR-pD}=C~$?)9pdm3XZ36N5PNWYjb z$xd$yNQR9N!dfj-Vd@BwQo^FIIWPPmT&sZyQ$v81(sCBV=PGy{0wltEjB%~h157*t zvbe_!{=I_783x!0t1-r#-d{Y?ae$Q4N_Nd^Ui^@y(%)Gjou6y<3^XJdu{rmUf-Me?)zZ>9OR&6U5H*cK; z$gUlB{g0O4gN0sLSO|Of?hU(l?;h(jA3uH!Z{EBKuV23ouU@^Y6#%v+QG;>e*E}%?wlu-NT4DG zs)z)7WbLr)vGAu(ohrKc^em@OpO&f~6_>E61n_e0_V3@{U3^O;j{`^mNCJUj_>;7v zsMs6Hu3g7+@v+lSo;=yTYFqq}jZmQ-BK8K{C4kqi_i*jBaQE(Au0607V-zKeT;EPg zX(`vrn=L+e74+-Tqeok@_`tDa$G9I|$nTU5H*2V8@y()n*zqM?J1G!-1aX;CfDC9B zTnJ#j_%*n8Qb1)re*Bno7g0RG{Eb;IK14irJYJp$5Z6ac9~b_P?+5t~95~SRG$g?1 znFJ7p$xV&GZ18m~79TGRdfsc-BcX$9yXTR*n)mPD@1~O(_?cT$ZvFPucRmGlq&se0 zKrcUf^k}4hM*biEJOWKzz!qQe;CB_ZtSOO9Owg#lZAc=s65^rb{fZe(TYu_rk!wKkEf}RIt=#Om( zR8mN`DM<^xj~59euMMspBolVN zAPTr8sSDI104orIAdmL$uOXn*6hga1G+0WD0E?UtabxC#VC~vf3|10|phW;yQ3CY8 z2CM=)ErF;xq-YJ5G|um}>*1#E+O_Mu|Nr#qQ&G1P-NMq@f?@*XUcSbV?tX=)ilM-Q zBZP|!Bpv0V;#ojKcpc7$=eqO;#Uy~#?^kNI{vSZfLx&DEt~LTmaKWXcx=joubklI<*Aw z>LtMaQ7DR<1I2LkWvwyu#Rwn~;ezT}_g(@5l3h?W%-a86Y-t#O1PubP+z<%?V5D(U zy57A6{h+{?kOZp7&WKZR+=sznMJ}+Dnpo=C_0%R_x_t~J5T?E_{+))l5v1%52>)d-`iiZyx|5!%M2Fb2dU zW3~MwwpEH9Rhue+k$UIOoo($Ds!NbOyMR36fRHu;*15(YcA7siIZk#%JWz>P!qX1?IUojG&nKR>^gArBt2 zit(ETyZ=@V&7mv_Fi4bABcnwP+jzQuHcfU&BrAV91u-rFvEi7y-KnWsvHH=d2 zgAk(GKm_S8RcTJ>2N3~&Hbwp{Z3NF_Xeh}g4Eke)V&dY{W(3&b1j9t4yK_aYJisZZ{1rcU5- z;eD>K;ndPq&B-8yA_S0F!4ThA&{1{x)H<#?k9a#6Pc6L?V^s0``ynL&D;p(!Nmx`Y zFkHex{4p!Ggm^@DlehW}iHHVi}~u=$&N? z(NEBLQ#UxxAkdW>X9LnqUr#t4Lu0=9L8&o>JsqTtT5|%gb3QA~hr0pED71+iFFr)dZ=Q=E6ng{NE{Z~0)C?deO#?Aj zSDQ$z#TeC2T^|=}6GBo-&$;E{HL3!q3Z-szuf)O=G#zDjin4SSP%o%6+2IT#sLjQa ziyxFFz~LMjWY+_a5H!U6%a<=b7QVP^ z*90a62;bVq{?@)P6^DWd^Yilq4|YTV2Nw!Yu;a1lPI-sxR)rf@Fe5DhDP7FH zZZ%4S*1C30P;|O+jB!1;m|rXT90Sm5*RBbQN`PKu+hDD*S^yE(CdtSfg=z>u$cIj> zPotato Pong - + diff --git a/srcs/requirements/svelte/api_front/public/sounds/pong/0.ogg b/srcs/requirements/svelte/api_front/public/sound/pong/0.ogg similarity index 100% rename from srcs/requirements/svelte/api_front/public/sounds/pong/0.ogg rename to srcs/requirements/svelte/api_front/public/sound/pong/0.ogg diff --git a/srcs/requirements/svelte/api_front/public/sounds/pong/1.ogg b/srcs/requirements/svelte/api_front/public/sound/pong/1.ogg similarity index 100% rename from srcs/requirements/svelte/api_front/public/sounds/pong/1.ogg rename to srcs/requirements/svelte/api_front/public/sound/pong/1.ogg diff --git a/srcs/requirements/svelte/api_front/public/sounds/pong/10.ogg b/srcs/requirements/svelte/api_front/public/sound/pong/10.ogg similarity index 100% rename from srcs/requirements/svelte/api_front/public/sounds/pong/10.ogg rename to srcs/requirements/svelte/api_front/public/sound/pong/10.ogg diff --git a/srcs/requirements/svelte/api_front/public/sounds/pong/11.ogg b/srcs/requirements/svelte/api_front/public/sound/pong/11.ogg similarity index 100% rename from srcs/requirements/svelte/api_front/public/sounds/pong/11.ogg rename to srcs/requirements/svelte/api_front/public/sound/pong/11.ogg diff --git a/srcs/requirements/svelte/api_front/public/sounds/pong/12.ogg b/srcs/requirements/svelte/api_front/public/sound/pong/12.ogg similarity index 100% rename from srcs/requirements/svelte/api_front/public/sounds/pong/12.ogg rename to srcs/requirements/svelte/api_front/public/sound/pong/12.ogg diff --git a/srcs/requirements/svelte/api_front/public/sounds/pong/13.ogg b/srcs/requirements/svelte/api_front/public/sound/pong/13.ogg similarity index 100% rename from srcs/requirements/svelte/api_front/public/sounds/pong/13.ogg rename to srcs/requirements/svelte/api_front/public/sound/pong/13.ogg diff --git a/srcs/requirements/svelte/api_front/public/sounds/pong/14.ogg b/srcs/requirements/svelte/api_front/public/sound/pong/14.ogg similarity index 100% rename from srcs/requirements/svelte/api_front/public/sounds/pong/14.ogg rename to srcs/requirements/svelte/api_front/public/sound/pong/14.ogg diff --git a/srcs/requirements/svelte/api_front/public/sounds/pong/15.ogg b/srcs/requirements/svelte/api_front/public/sound/pong/15.ogg similarity index 100% rename from srcs/requirements/svelte/api_front/public/sounds/pong/15.ogg rename to srcs/requirements/svelte/api_front/public/sound/pong/15.ogg diff --git a/srcs/requirements/svelte/api_front/public/sounds/pong/16.ogg b/srcs/requirements/svelte/api_front/public/sound/pong/16.ogg similarity index 100% rename from srcs/requirements/svelte/api_front/public/sounds/pong/16.ogg rename to srcs/requirements/svelte/api_front/public/sound/pong/16.ogg diff --git a/srcs/requirements/svelte/api_front/public/sounds/pong/17.ogg b/srcs/requirements/svelte/api_front/public/sound/pong/17.ogg similarity index 100% rename from srcs/requirements/svelte/api_front/public/sounds/pong/17.ogg rename to srcs/requirements/svelte/api_front/public/sound/pong/17.ogg diff --git a/srcs/requirements/svelte/api_front/public/sounds/pong/18.ogg b/srcs/requirements/svelte/api_front/public/sound/pong/18.ogg similarity index 100% rename from srcs/requirements/svelte/api_front/public/sounds/pong/18.ogg rename to srcs/requirements/svelte/api_front/public/sound/pong/18.ogg diff --git a/srcs/requirements/svelte/api_front/public/sounds/pong/19.ogg b/srcs/requirements/svelte/api_front/public/sound/pong/19.ogg similarity index 100% rename from srcs/requirements/svelte/api_front/public/sounds/pong/19.ogg rename to srcs/requirements/svelte/api_front/public/sound/pong/19.ogg diff --git a/srcs/requirements/svelte/api_front/public/sounds/pong/2.ogg b/srcs/requirements/svelte/api_front/public/sound/pong/2.ogg similarity index 100% rename from srcs/requirements/svelte/api_front/public/sounds/pong/2.ogg rename to srcs/requirements/svelte/api_front/public/sound/pong/2.ogg diff --git a/srcs/requirements/svelte/api_front/public/sounds/pong/20.ogg b/srcs/requirements/svelte/api_front/public/sound/pong/20.ogg similarity index 100% rename from srcs/requirements/svelte/api_front/public/sounds/pong/20.ogg rename to srcs/requirements/svelte/api_front/public/sound/pong/20.ogg diff --git a/srcs/requirements/svelte/api_front/public/sounds/pong/21.ogg b/srcs/requirements/svelte/api_front/public/sound/pong/21.ogg similarity index 100% rename from srcs/requirements/svelte/api_front/public/sounds/pong/21.ogg rename to srcs/requirements/svelte/api_front/public/sound/pong/21.ogg diff --git a/srcs/requirements/svelte/api_front/public/sounds/pong/22.ogg b/srcs/requirements/svelte/api_front/public/sound/pong/22.ogg similarity index 100% rename from srcs/requirements/svelte/api_front/public/sounds/pong/22.ogg rename to srcs/requirements/svelte/api_front/public/sound/pong/22.ogg diff --git a/srcs/requirements/svelte/api_front/public/sounds/pong/23.ogg b/srcs/requirements/svelte/api_front/public/sound/pong/23.ogg similarity index 100% rename from srcs/requirements/svelte/api_front/public/sounds/pong/23.ogg rename to srcs/requirements/svelte/api_front/public/sound/pong/23.ogg diff --git a/srcs/requirements/svelte/api_front/public/sounds/pong/24.ogg b/srcs/requirements/svelte/api_front/public/sound/pong/24.ogg similarity index 100% rename from srcs/requirements/svelte/api_front/public/sounds/pong/24.ogg rename to srcs/requirements/svelte/api_front/public/sound/pong/24.ogg diff --git a/srcs/requirements/svelte/api_front/public/sounds/pong/25.ogg b/srcs/requirements/svelte/api_front/public/sound/pong/25.ogg similarity index 100% rename from srcs/requirements/svelte/api_front/public/sounds/pong/25.ogg rename to srcs/requirements/svelte/api_front/public/sound/pong/25.ogg diff --git a/srcs/requirements/svelte/api_front/public/sounds/pong/26.ogg b/srcs/requirements/svelte/api_front/public/sound/pong/26.ogg similarity index 100% rename from srcs/requirements/svelte/api_front/public/sounds/pong/26.ogg rename to srcs/requirements/svelte/api_front/public/sound/pong/26.ogg diff --git a/srcs/requirements/svelte/api_front/public/sounds/pong/27.ogg b/srcs/requirements/svelte/api_front/public/sound/pong/27.ogg similarity index 100% rename from srcs/requirements/svelte/api_front/public/sounds/pong/27.ogg rename to srcs/requirements/svelte/api_front/public/sound/pong/27.ogg diff --git a/srcs/requirements/svelte/api_front/public/sounds/pong/28.ogg b/srcs/requirements/svelte/api_front/public/sound/pong/28.ogg similarity index 100% rename from srcs/requirements/svelte/api_front/public/sounds/pong/28.ogg rename to srcs/requirements/svelte/api_front/public/sound/pong/28.ogg diff --git a/srcs/requirements/svelte/api_front/public/sounds/pong/29.ogg b/srcs/requirements/svelte/api_front/public/sound/pong/29.ogg similarity index 100% rename from srcs/requirements/svelte/api_front/public/sounds/pong/29.ogg rename to srcs/requirements/svelte/api_front/public/sound/pong/29.ogg diff --git a/srcs/requirements/svelte/api_front/public/sounds/pong/3.ogg b/srcs/requirements/svelte/api_front/public/sound/pong/3.ogg similarity index 100% rename from srcs/requirements/svelte/api_front/public/sounds/pong/3.ogg rename to srcs/requirements/svelte/api_front/public/sound/pong/3.ogg diff --git a/srcs/requirements/svelte/api_front/public/sounds/pong/30.ogg b/srcs/requirements/svelte/api_front/public/sound/pong/30.ogg similarity index 100% rename from srcs/requirements/svelte/api_front/public/sounds/pong/30.ogg rename to srcs/requirements/svelte/api_front/public/sound/pong/30.ogg diff --git a/srcs/requirements/svelte/api_front/public/sounds/pong/31.ogg b/srcs/requirements/svelte/api_front/public/sound/pong/31.ogg similarity index 100% rename from srcs/requirements/svelte/api_front/public/sounds/pong/31.ogg rename to srcs/requirements/svelte/api_front/public/sound/pong/31.ogg diff --git a/srcs/requirements/svelte/api_front/public/sounds/pong/32.ogg b/srcs/requirements/svelte/api_front/public/sound/pong/32.ogg similarity index 100% rename from srcs/requirements/svelte/api_front/public/sounds/pong/32.ogg rename to srcs/requirements/svelte/api_front/public/sound/pong/32.ogg diff --git a/srcs/requirements/svelte/api_front/public/sounds/pong/4.ogg b/srcs/requirements/svelte/api_front/public/sound/pong/4.ogg similarity index 100% rename from srcs/requirements/svelte/api_front/public/sounds/pong/4.ogg rename to srcs/requirements/svelte/api_front/public/sound/pong/4.ogg diff --git a/srcs/requirements/svelte/api_front/public/sounds/pong/5.ogg b/srcs/requirements/svelte/api_front/public/sound/pong/5.ogg similarity index 100% rename from srcs/requirements/svelte/api_front/public/sounds/pong/5.ogg rename to srcs/requirements/svelte/api_front/public/sound/pong/5.ogg diff --git a/srcs/requirements/svelte/api_front/public/sounds/pong/6.ogg b/srcs/requirements/svelte/api_front/public/sound/pong/6.ogg similarity index 100% rename from srcs/requirements/svelte/api_front/public/sounds/pong/6.ogg rename to srcs/requirements/svelte/api_front/public/sound/pong/6.ogg diff --git a/srcs/requirements/svelte/api_front/public/sounds/pong/7.ogg b/srcs/requirements/svelte/api_front/public/sound/pong/7.ogg similarity index 100% rename from srcs/requirements/svelte/api_front/public/sounds/pong/7.ogg rename to srcs/requirements/svelte/api_front/public/sound/pong/7.ogg diff --git a/srcs/requirements/svelte/api_front/public/sounds/pong/8.ogg b/srcs/requirements/svelte/api_front/public/sound/pong/8.ogg similarity index 100% rename from srcs/requirements/svelte/api_front/public/sounds/pong/8.ogg rename to srcs/requirements/svelte/api_front/public/sound/pong/8.ogg diff --git a/srcs/requirements/svelte/api_front/public/sounds/pong/9.ogg b/srcs/requirements/svelte/api_front/public/sound/pong/9.ogg similarity index 100% rename from srcs/requirements/svelte/api_front/public/sounds/pong/9.ogg rename to srcs/requirements/svelte/api_front/public/sound/pong/9.ogg diff --git a/srcs/requirements/svelte/api_front/public/sounds/roblox-oof.ogg b/srcs/requirements/svelte/api_front/public/sound/roblox-oof.ogg similarity index 100% rename from srcs/requirements/svelte/api_front/public/sounds/roblox-oof.ogg rename to srcs/requirements/svelte/api_front/public/sound/roblox-oof.ogg diff --git a/srcs/requirements/svelte/api_front/src/pages/game/Game.svelte b/srcs/requirements/svelte/api_front/src/pages/game/Game.svelte index da29126f..d537a794 100644 --- a/srcs/requirements/svelte/api_front/src/pages/game/Game.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/game/Game.svelte @@ -15,7 +15,7 @@ let optionsAreNotSet = true - let soundMutedFlag = false; + let sound = "on"; // possible de faire un boolean avec svelte et radio buttons ? let multi_balls = false; let moving_walls = false; let matchOptions : enumeration.MatchOptions = enumeration.MatchOptions.noOption; @@ -23,9 +23,14 @@ // En async au cas où pour la suite mais apriori inutile, les check se feront sûrement au onMount const init = async() => { - console.log(soundMutedFlag); + if (sound === "off") { + initAudio(true); + } + else if (sound === "on") { + initAudio(false); + } + console.log(sound); - initAudio(soundMutedFlag); if (multi_balls === true) { matchOptions |= enumeration.MatchOptions.multiBalls; } @@ -86,9 +91,9 @@
- + - +
diff --git a/srcs/requirements/svelte/api_front/src/pages/game/client/class/RectangleClient.ts b/srcs/requirements/svelte/api_front/src/pages/game/client/class/RectangleClient.ts index a1d3a1e4..e671fb3f 100644 --- a/srcs/requirements/svelte/api_front/src/pages/game/client/class/RectangleClient.ts +++ b/srcs/requirements/svelte/api_front/src/pages/game/client/class/RectangleClient.ts @@ -81,7 +81,9 @@ export class BallClient extends Ball implements GraphicComponent { } bounce(collider?: Rectangle) { this._bounceAlgo(collider); - soundPongArr[ Math.floor(random(0, soundPongArr.length)) ].play(); + let i = Math.floor(random(0, soundPongArr.length)); + soundPongArr[ i ].play(); + console.log(`sound_i=${i}`); // debug log } }