From b1e95f0c3d22e93e522602a244163654a945b368 Mon Sep 17 00:00:00 2001 From: Mees Roelofsz Date: Tue, 16 Jan 2024 14:46:43 +0100 Subject: [PATCH] added scoremenu and used name functions --- web/js/Menu.js | 48 +++++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/web/js/Menu.js b/web/js/Menu.js index 3b74428..e947afc 100644 --- a/web/js/Menu.js +++ b/web/js/Menu.js @@ -1,12 +1,6 @@ let buttonSelectScore = 0; let searchName = ''; let scorescreenOn = false; -function scoremenu() { - - textSize(50) - fill(255, 255, 255) - text("Hi, dit is een scorescreen", width / 2, height / 2 - 100) -} function keyPressed() { // Check if the back button was selected and the Enter key was pressed @@ -18,19 +12,19 @@ function keyPressed() { function homescreen() { textAlign(CENTER); button(255, 255, 255, width / 2, height / 2, "Start Game") - button(255, 255, 255, width / 2, height / 2 + height/12, "Scores") - + button(255, 255, 255, width / 2, height / 2 + height / 12, "Scores") + push() - stroke(4,217,255) + stroke(4, 217, 255) strokeWeight(5) fill(0, 255, 0, 0) - rect(width/5*4, height/2, width/4, height/1.5) + rect(width / 5 * 4, height / 2, width / 4, height / 1.5) pop() //highscores rectangle push() textSize(50) fill(255, 255, 255) - text("Highscores", width/5, height/4) + text("Highscores", width / 5, height / 4) pop() push() @@ -38,21 +32,21 @@ function homescreen() { textSize(25) textAlign(CENTER, CENTER) for (let i = 0; i < requesteddata.length; i++) { - text(i + 1 + ". " + requesteddata[i].Naam + ": " + requesteddata[i].Score, width/5, height/3 + (i * 30)) + text(i + 1 + ". " + requesteddata[i].Naam + ": " + requesteddata[i].Score, width / 5, height / 3 + (i * 30)) } pop() push() - stroke(4,217,255) + stroke(4, 217, 255) strokeWeight(5) fill(0, 255, 0, 0) - rect(width/5, height/2, width/4, height/1.5) + rect(width / 5, height / 2, width / 4, height / 1.5) pop() push() textSize(50) fill(255, 255, 255) - text("Controls", width/5*4, height/4) + text("Controls", width / 5 * 4, height / 4) pop() } @@ -64,16 +58,32 @@ function button(r, g, b, buttonX, buttonY, buttonText) { textSize(25) fill(r, g, b) textAlign(CENTER); - text(buttonText, buttonX, buttonY + buttonHeight/4) + text(buttonText, buttonX, buttonY + buttonHeight / 4) pop() } -function pauseMenu(){ +function pauseMenu() { textAlign(CENTER); textSize(50); fill(255, 255, 255); - text("Paused", width / 2, height / 2 - height/6); + text("Paused", width / 2, height / 2 - height / 6); button(255, 255, 255, width / 2, height / 2, "Resume"); - button(255, 255, 255, width / 2, height / 2 + height/12, "Main Menu"); + button(255, 255, 255, width / 2, height / 2 + height / 12, "Main Menu"); +} + +function scoremenu() { + textAlign(CENTER); + textSize(50); + fill(255, 255, 255); + text("Score", width / 2, height / 2 - height / 6); + textSize(32); + text(letters[currentIndex[0]], width / 2 - 30, height / 2); + text(letters[currentIndex[1]], width / 2, height / 2); + text(letters[currentIndex[2]], width / 2 + 30, height / 2); + + if (scorescreenOn && keyReleasedFlag) { + nameSubmit(); + } + nameDraw(); } \ No newline at end of file