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 7e6f5eb5..00000000 Binary files a/srcs/requirements/svelte/api_front/public/favicon.png and /dev/null differ diff --git a/srcs/requirements/svelte/api_front/public/index.html b/srcs/requirements/svelte/api_front/public/index.html index 2e6a0f20..786ea3ad 100644 --- a/srcs/requirements/svelte/api_front/public/index.html +++ b/srcs/requirements/svelte/api_front/public/index.html @@ -6,7 +6,7 @@ Potato 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 } }