From 2b4d331b770d28827ffdc6795443c89b5593d42b Mon Sep 17 00:00:00 2001
From: sam <hossan@ad.hva.nl>
Date: Wed, 6 Dec 2023 13:19:51 +0100
Subject: [PATCH] added push and pop to every drawing

---
 web/game.js | 50 +++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 41 insertions(+), 9 deletions(-)

diff --git a/web/game.js b/web/game.js
index d04b6fc..ccb30c9 100644
--- a/web/game.js
+++ b/web/game.js
@@ -45,11 +45,8 @@ let x4;
 let y4;
 let x5;
 let y5;
-
+let homescreenOn = false;
 let bulletAmount = 10;
-
-let Startscreen = new Startscreen(width, height);
-
 //let myBullet = new bullet();
 // the function setup() is called once when the page is loaded
 function setup() {
@@ -62,7 +59,6 @@ function setup() {
     // disable the outline of shapes
     Movementloop()
     noStroke();
-    
 }
 
 function score() {
@@ -72,10 +68,12 @@ function score() {
 function life() {
     textAlign(CENTER);
     if (lives == 0) {
+        push();
         fill(255, 0, 0);
         textSize(40);
         textAlign(CENTER);
         text("Game Over", width/2, height/2);
+        pop();
         if (key == ' ') {
             lives = 1;
             time = 0;
@@ -150,7 +148,6 @@ async function Movementloop() {
 
 // the function draw() is called every frame
 function draw() {
-    textSize(10);
     keyPressed();
     life();
     // draw background
@@ -158,18 +155,35 @@ function draw() {
     background(0, 0, 0, 100);
     if (!(lives == 0)) {
         // draw player
+        push();
         fill(0, 255, 255)
         circle(constrain(playerPosX, 0 + radius, width - radius), constrain(playerPosY, 0 + radius, height - radius), playerSize);
+        pop();
         movementCheck()
         // draw boss
+        push();
         fill(255, 165, 0)
         circle(x2, y2, 50);
+        pop();
         if (hasMoved == true) {
+            push();
             score();
+            textSize(10);
+            textAlign(LEFT);
+            fill(255, 0, 255)
+            text(int(time), 10, 20);
+            pop();
+        }
+        if (hasMoved == false) {
+            push();
+            score();
+            textSize(10);
+            textAlign(LEFT);
+            fill(255, 0, 255)
+            text(0, 10, 20);
+            pop();
         }
 
-        textAlign(LEFT);
-        text(int(time), 10, 20);
 
         randomAttackPattern()
         if (patern == 2) {
@@ -185,9 +199,14 @@ function draw() {
             y4 = map(cosY, -1, 1, playerPosY - 100, playerPosY + 100);
             x5 = map(sinX, -1, 1, playerPosX - 100, playerPosX + 100);
             y5 = map(-cosY, -1, 1, playerPosY - 100, playerPosY + 100);
+            push();
+            fill(255, 165, 0)
             circle(x3, y3, 50);
             circle(x4, y4, 50);
             circle(x5, y5, 50);
+            pop(); 
+
+            
         } else {
             x2 = width / 2;
             y2 = 100;
@@ -206,6 +225,11 @@ function draw() {
         //blijf de bullet tekenen zolang hit false is
         bullets = bullets.filter(bullet => !bullet.hit);
     }
+
+
+    if (homescreenOn == true) {
+        homescreen();
+    }
 }
 
 function randomAttackPattern() {
@@ -293,4 +317,12 @@ function spawnRandomBullet() {
         }
         angle = 0;
     }
-}
\ No newline at end of file
+}
+
+
+function homescreen() {
+    push()
+    circle(100, 100, 100)
+    color(255, 0, 255, 200)
+    pop()
+}