From e5829ab9cffb960e422fa4c0ad429c2eaa1065b5 Mon Sep 17 00:00:00 2001
From: Lev <levdoescode@gmail.com>
Date: Thu, 10 Jun 2021 23:22:48 -0500
Subject: [PATCH] Add timer, instructions and big green bird

---
 .../Topic 4/4.5.1/libraries/.DS_Store         | Bin 6148 -> 0 bytes
 .../Topic 4/4.5.1/physics.js                  |  59 ++++++++-
 .../Topic 4/4.5.1/sketch.js                   | 113 +++++++++++++++++-
 3 files changed, 166 insertions(+), 6 deletions(-)
 delete mode 100644 CM2030 Graphics Programming/Topic 4/4.5.1/libraries/.DS_Store

diff --git a/CM2030 Graphics Programming/Topic 4/4.5.1/libraries/.DS_Store b/CM2030 Graphics Programming/Topic 4/4.5.1/libraries/.DS_Store
deleted file mode 100644
index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

diff --git a/CM2030 Graphics Programming/Topic 4/4.5.1/physics.js b/CM2030 Graphics Programming/Topic 4/4.5.1/physics.js
index d396a29..fecdbdb 100644
--- a/CM2030 Graphics Programming/Topic 4/4.5.1/physics.js	
+++ b/CM2030 Graphics Programming/Topic 4/4.5.1/physics.js	
@@ -14,12 +14,14 @@ function drawGround() {
   drawVertices(ground.vertices);
   pop();
 }
+
 ////////////////////////////////////////////////////////////////
 function setupPropeller() {
   // your code here
   propeller = Bodies.rectangle(150, 480, 200, 15, { isStatic: true, angle: 0 });
   World.add(engine.world, [propeller]);
 }
+
 ////////////////////////////////////////////////////////////////
 //updates and draws the propeller
 function drawPropeller() {
@@ -27,12 +29,11 @@ function drawPropeller() {
   Body.setAngularVelocity(propeller, angleSpeed);
   push();
   fill(255);
-  //translate(propeller.position.x, propeller.position.y);
-  //rotate(propeller.angle);
   drawVertices(propeller.vertices);
   pop();
   angle += angleSpeed;
 }
+
 ////////////////////////////////////////////////////////////////
 function setupBird() {
   var bird = Bodies.circle(mouseX, mouseY, 20, {
@@ -45,13 +46,38 @@ function setupBird() {
   pinkFrame.push(Math.trunc(random(1, 5)) - 1);
   birds.push(bird);
 }
+
+////////////////////////////////////////////////////////////////
+function setupGreenBird() {
+  if(greenCount == 0)
+    return;
+  var greenBird = Bodies.circle(200, 250, 60, {
+    friction: 0,
+    restitution: 0.95
+  });
+
+  slingshotConstraint = Constraint.create({
+    bodyB: greenBird,
+    pointA: { x: 200, y: 200 },
+    pointB: { x: 0, y: 0 },
+    stiffness: 0.01,
+    damping: 0.0001,
+  });
+
+  Matter.Body.setMass(greenBird, greenBird.mass * 10);
+  World.add(engine.world, [greenBird, slingshotConstraint]);
+
+  greenFrame.push(Math.trunc(random(1, 5)) - 1);
+  greenBirds.push(greenBird);
+  greenCount--;
+}
 ////////////////////////////////////////////////////////////////
 function drawBirds() {
   fill("orange");
   for (let i = 0; i < birds.length; i++) {
     //drawVertices(birds[i].vertices);
     //replaced with image
-    
+
     push();
     imageMode(CENTER);
     translate(birds[i].position.x, birds[i].position.y);
@@ -68,9 +94,32 @@ function drawBirds() {
       i--;
     }
   }
-  //console.log("# Birds: ", birds.length);
-  //console.log("# World Bodies: ", engine.world.bodies.length);
 }
+
+////////////////////////////////////////////////////////////////
+function drawGreenBirds() {
+  fill("green");
+  for (let i = 0; i < greenBirds.length; i++) {
+    push();
+    imageMode(CENTER);
+    translate(greenBirds[i].position.x, greenBirds[i].position.y);
+    rotate(greenBirds[i].angle);
+    image(greenSprite[greenFrame[i]], 0, 0, 120, 120);
+    pop();
+    if (frameCount % 5 == 0)
+      greenFrame[i] < 3 ? greenFrame[i]++ : (greenFrame[i] = 0);
+
+    if (isOffScreen(greenBirds[i])) {
+      World.remove(engine.world, greenBirds[i]);
+      greenBirds.splice(i, 1);
+      greenFrame.splice(i, 1);
+      i--;
+    }
+  }
+}
+
+
+
 ////////////////////////////////////////////////////////////////
 //creates a tower of boxes
 function setupTower() {
diff --git a/CM2030 Graphics Programming/Topic 4/4.5.1/sketch.js b/CM2030 Graphics Programming/Topic 4/4.5.1/sketch.js
index 8acbd0c..68dbf6d 100644
--- a/CM2030 Graphics Programming/Topic 4/4.5.1/sketch.js	
+++ b/CM2030 Graphics Programming/Topic 4/4.5.1/sketch.js	
@@ -19,6 +19,7 @@ let birds = [];
 let colors = [];
 let ground;
 let slingshotBirds = [];
+let greenBirds = [];
 let slingshotConstraint;
 let angle=0;
 let angleSpeed=0.01;
@@ -30,6 +31,12 @@ let greenSprite = [];
 let greenFrame = [];
 let redSprite = [];
 let redFrame = [];
+
+let timeLeft = 20;
+let started = false;
+let gameOver = false;
+let gameWon = false;
+let greenCount = 2;
 ////////////////////////////////////////////////////////////
 function preload()
 {
@@ -81,10 +88,106 @@ function draw() {
   drawBirds();
 
   drawSlingshot();
+
+  drawGreenBirds();
+
+  drawGUI();
+
+  checkWin();
 }
+
+function checkWin()
+{
+  if(boxes.bodies.length == 0 && !gameOver)
+  {
+    gameWon = true;
+  }
+}
+
+function drawGUI()
+{
+  // Press key to start
+  if(!started)
+  {
+    textAlign(CENTER);
+    textSize(40);
+    stroke(0)
+    strokeWeight(1);
+    fill('yellow');
+    text("Click or Press any key to start", width/2, height/2);
+  }
+
+  // draw birds
+  textAlign(CENTER);
+  textSize(30);
+  stroke(0)
+  strokeWeight(1);
+  fill('white');
+  image(pinkSprite[0], 20, 20, 30, 30);
+  image(redSprite[0], 20, 50, 30, 30);
+  image(greenSprite[0], 20, 80, 30, 30);
+  text("∞", 80, 50);
+  text("∞", 80, 80);
+  
+  text(greenCount.toString(), 80, 110);
+  // draw instructions
+  textSize(20);
+  textAlign(LEFT);
+  stroke(0)
+  strokeWeight(1);
+  fill(255);
+  text("B: pink bird", width - 150, 50);
+  text("R: red bird", width - 150, 70);
+  text("G: green bird", width - 150, 90);
+  text("←: faster spin", width - 150, 110);
+  text("→: slower spin", width - 150, 130);
+
+  // draw time left
+  stroke(0)
+  strokeWeight(1);
+  fill('white');
+  let textSizeCounter = 20;
+  textSize(textSizeCounter);
+  textAlign(CENTER);
+  text("TIME LEFT", width /2, 20);
+  if(started && !gameOver && !gameWon && frameCount % 60 == 0)
+  {
+    timeLeft -= 1;
+  }
+
+  // draw game over
+  text(timeLeft.toString(), width /2, textSizeCounter * 2);
+  if(timeLeft == 0 && !gameWon)
+  {
+    gameOver = true;
+    textAlign(CENTER);
+    textSize(40);
+    stroke(0)
+    strokeWeight(1);
+    fill('red');
+    text("GAME OVER", width/2, height/2);
+    textSize(textSizeCounter);
+    text("Refresh to start again", width/2, height/2 + textSizeCounter * 2 );
+  }
+
+  // game won
+  if(gameWon)
+  {
+    textAlign(CENTER);
+    textSize(40);
+    stroke(0)
+    strokeWeight(1);
+    fill('orange');
+    text("You have WON", width/2, height/2);
+    textSize(textSizeCounter);
+    text("Refresh to start again", width/2, height/2 + textSizeCounter * 2 );
+  }
+}
+
 ////////////////////////////////////////////////////////////
 //use arrow keys to control propeller
 function keyPressed(){
+  started = true;
   if (keyCode == LEFT_ARROW){
     angleSpeed += 0.01;
   }
@@ -94,6 +197,8 @@ function keyPressed(){
 }
 ////////////////////////////////////////////////////////////
 function keyTyped(){
+  if(gameOver || gameWon)
+    return;
   //if 'b' create a new bird to use with propeller
   if (key==='b'){
     setupBird();
@@ -103,7 +208,12 @@ function keyTyped(){
   if (key==='r'){
     //removeFromWorld(slingshotBird);
     removeFromWorld(slingshotConstraint);
-    setupSlingshot();
+    setupSlingshot(key);
+  }
+
+  if(key=='g'){
+    removeFromWorld(slingshotConstraint);
+    setupGreenBird();
   }
 }
 
@@ -114,6 +224,7 @@ function keyTyped(){
 //if mouse is released destroy slingshot constraint so that
 //slingshot bird can fly off
 function mouseReleased(){
+  started = true;
   setTimeout(() => {
     slingshotConstraint.bodyB = null;
     slingshotConstraint.pointA = { x: 0, y: 0 };