Formatting/style fixes

Author: meiamsome

bird.js

@@ -5,14 +5,14 @@
 
 class Bird {
   constructor() {
-    this.y = height/2;
+    this.y = height / 2;
     this.x = 64;
 
     this.gravity = 0.6;
     this.lift = -15;
     this.velocity = 0;
-    
-    this.icon = loadImage("graphics/train.png");
+
+    this.icon = birdSprite;
     this.width = 64;
     this.height = 64;
   }
@@ -21,7 +21,7 @@ class Bird {
     // draw the icon CENTERED around the X and Y coords of the bird object
     image(this.icon, this.x - (this.width / 2), this.y - (this.height / 2), this.width, this.height);
   }
-  
+
   up() {
     this.velocity += this.lift;
   }
@@ -30,16 +30,15 @@ class Bird {
     this.velocity += this.gravity;
     this.velocity *= 0.9;
     this.y += this.velocity;
-    
-    if (this.y >= height - this.height/2) {
-      this.y = height - this.height/2;
+
+    if (this.y >= height - this.height / 2) {
+      this.y = height - this.height / 2;
       this.velocity = 0;
     }
 
-    if (this.y <= this.height/2) {
-      this.y = this.height/2;
+    if (this.y <= this.height / 2) {
+      this.y = this.height / 2;
       this.velocity = 0;
     }
   }
 }
-

pipe.js

@@ -6,22 +6,22 @@
 class Pipe {
   constructor() {
     this.spacing = 110;
-    this.top = random(height/6, 3/4*height);
+    this.top = random(height / 6, 3 / 4 * height);
     this.bottom = this.top + this.spacing;
 
     this.x = width;
     this.w = 20;
     this.speed = 2;
 
-    this.passed=false;
+    this.passed = false;
     this.highlight = false;
   }
 
   hits(bird) {
-    if (bird.y - (bird.height / 2) < this.top || bird.y+(bird.height / 2) > this.bottom) {
-      if (bird.x +(bird.width / 2)> this.x + this.w && bird.x - (bird.width / 2) < this.x) {
+    if (bird.y - (bird.height / 2) < this.top || bird.y + (bird.height / 2) > this.bottom) {
+      if (bird.x + (bird.width / 2) > this.x + this.w && bird.x - (bird.width / 2) < this.x) {
         this.highlight = true;
-        this.passed=true;
+        this.passed = true;
         return true;
       }
     }
@@ -31,16 +31,16 @@ class Pipe {
 
   //this function is used to calculate scores and checks if we've went through the pipes
   pass(bird) {
-        if (bird.x > this.x && !this.passed) {
-            this.passed=true;
-            return true;
-        }
-        return false;
+    if (bird.x > this.x && !this.passed) {
+      this.passed = true;
+      return true;
+    }
+    return false;
   }
-    
+
   show() {
-    image(pipeBodySprite,this.x,0,this.w,this.top);
-    image(pipeBodySprite,this.x,this.bottom,this.w,height);
+    image(pipeBodySprite, this.x, 0, this.w, this.top);
+    image(pipeBodySprite, this.x, this.bottom, this.w, height);
   }
 
   update() {

sketch.js

@@ -5,37 +5,33 @@
 
 var bird;
 var pipes = [];
-var score=0;
-var maxScore=0;
-
-var  pipeSprite,pipBodySprite;
+var score = 0;
+var maxScore = 0;
+var birdIcon;
+var pipeBodySprite;
+var bgImg;
+var bgX = 0;
 
 function preload() {
-
-pipeBodySprite = loadImage("./graphics/pipe_body.png");
-  
+  pipeBodySprite = loadImage("./graphics/pipe_body.png");
+  birdSprite = loadImage("graphics/train.png");
+  bgImg = loadImage("graphics/background.png");
 }
 
-var bgImg;
-var bgX = 0;
-
 function setup() {
   createCanvas(600, 600);
   bird = new Bird();
   pipes.push(new Pipe());
-  bgImg = loadImage("graphics/background.png");
 }
 
 function draw() {
-
   background(0);
-    
   // Draw our background image, then move it at the same speed as the pipes
   image(bgImg, bgX, 0, bgImg.width, height);
   bgX -= pipes[0].speed;
 
   // this handles the "infinite loop" by checking if the right
-  // edge of the image would be on the screen, if it is draw a 
+  // edge of the image would be on the screen, if it is draw a
   // second copy of the image right next to it
   // once the second image gets to the 0 point, we can reset bgX to
   // 0 and go back to drawing just one image.
@@ -54,17 +50,14 @@ function draw() {
       console.log("YAY");
       score++;
     }
-      
+
     if (pipes[i].hits(bird)) {
       gameover();
     }
 
-
     if (pipes[i].offscreen()) {
       pipes.splice(i, 1);
     }
-
-
   }
 
   bird.update();
@@ -74,26 +67,24 @@ function draw() {
     pipes.push(new Pipe());
   }
 
-
   showScores();
 }
 
 function showScores() {
-    textSize(32);
-    text("score: "+score,1,32 );
-    text("record: "+maxScore,1,64 );   
+  textSize(32);
+  text("score: " + score, 1, 32);
+  text("record: " + maxScore, 1, 64);
 }
 
 function gameover() {
-      console.log("HIT");
-      textSize(64);  
-      text('HIT',width/2,height/2);
-      maxScore=max(score,maxScore);
-      score=0;
+  console.log("HIT");
+  textSize(64);
+  text("HIT", width / 2, height / 2);
+  maxScore = max(score, maxScore);
+  score = 0;
 }
 function keyPressed() {
-  if (key == ' ') {
+  if (key == " ") {
     bird.up();
-    //console.log("SPACE");
   }
-}
+}