Diff: main.cpp

Revision:

3:5409b50b01b0

Parent:

2:9f5714571c41

Child:

4:e98b22e5d5e8

--- a/main.cpp	Thu Apr 11 21:34:53 2019 +0000
+++ b/main.cpp	Tue Apr 23 17:09:28 2019 +0000
@@ -11,12 +11,15 @@
 #include "mbed.h"
 #include "N5110.h"
 #include "Gamepad.h"
+#include "Pipes.h"
+//#include "Bird.h"
 
 N5110 lcd(PTC9,PTC0,PTC7,PTD2,PTD1,PTC11);
 Gamepad pad;
-int xaxis=35;
-int yaxis=20;
-    const int bird [40][40] =  
+//Bird bird;
+Pipes pipes;
+
+    const int intro [40][40] =  
      {
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -61,22 +64,24 @@
 
 };
 
-const int moving [9][9] = 
+const int moving [6][6] = 
 {
-    0,0,0,0,0,0,0,0,0,
-    0,0,0,1,1,0,0,0,0,
-    0,0,1,1,1,1,0,0,0,
-    0,1,1,1,1,1,1,0,0,
-    0,1,1,1,1,1,1,1,1,
-    0,1,1,1,1,1,1,1,1,
-    0,1,1,1,1,1,1,1,0,
-    0,0,1,1,1,1,1,0,0,
-    0,0,0,1,1,1,0,0,0,
+    0,0,1,1,0,0,
+    0,1,0,1,1,0,
+    1,0,1,1,1,1,
+    1,1,1,1,1,0,
+    0,1,1,1,1,0,
+    0,0,0,0,0,0,
     
     };
 
 void welcome();
 void start(int xaxis,int yaxis);
+//void pipes(int pipex,int height);
+
+int xaxis=25;
+int yaxis=20;
+
 int main() {
     lcd.init();
     pad.init();
@@ -86,27 +91,55 @@
    if (pad.check_event(Gamepad::START_PRESSED) == false) {
        lcd.clear();
        
+       int xvalue=84;
+       int height = rand() % (20 + 1 - 2) + 2;
+    int score = 0;
+    char scoredisplay[3];
    while(1) {
-    lcd.drawRect(0,44,84,4,FILL_BLACK);
-    int height = rand() % (20 + 1 - 2) + 2;
-    lcd.drawRect(40,0,5,height,FILL_BLACK);
-   lcd.drawSprite(xaxis,yaxis,9,9,(int*)moving);
+    lcd.drawRect(0,45,84,3,FILL_BLACK);
+    
+     //lcd.drawRect(xvalue,0,5,height,FILL_BLACK);
+      //lcd.drawRect(xvalue,(height+20),5,(84-(height+20)),FILL_BLACK);
+      //pipes.init(xvalue,height);
+      pipes.init(xvalue,height);
+      pipes.draw(lcd);
+      xvalue=xvalue-1;
+      sprintf(scoredisplay,"%d",score);
+      lcd.printString(scoredisplay,60,0);
+     
+      if(xvalue<20 && xvalue>17) {
+          score=score+1;
+          }
+         
+          
+      if(xvalue<1) {
+          height=rand() % (20 + 1 - 2) + 2;
+          xvalue=84;
+          }
+          
+    //pipes(xvalue,height);
+    //bird.init(xaxis,yaxis);
+    //bird.draw(lcd);
+   lcd.drawSprite(xaxis,yaxis,6,6,(int*)moving);
    yaxis=yaxis+2;
    if (pad.check_event(Gamepad::A_PRESSED) == true) {
        yaxis=yaxis-16;
        }
-       wait(0.05);
+       wait(0.075);
+       xvalue=xvalue-1;
    //wait(0.1);
    lcd.refresh();
    lcd.clear();
    }
        }
+       
+      
        }
 
 
 
 void welcome() {
-     lcd.drawSprite(0,0,40,40,(int*)bird);
+     lcd.drawSprite(0,0,40,40,(int*)intro);
     lcd.printString(" Flappy   ",40,0); 
     lcd.printString(" Bird   ",40,1); 
     lcd.printString(" Press  ",40,3);  
@@ -121,8 +154,21 @@
     }
 
 void start(int xaxis,int yaxis) {
-    lcd.refresh();
-    lcd.drawSprite(xaxis,yaxis,9,9,(int*)moving);
-    yaxis=yaxis-1;
+    lcd.drawRect(0,45,84,3,FILL_BLACK);
+    int height = rand() % (20 + 1 - 2) + 2;
+    lcd.drawRect(40,0,5,height,FILL_BLACK);
+   lcd.drawSprite(xaxis,yaxis,9,9,(int*)moving);
+   yaxis=yaxis+2;
+   if (pad.check_event(Gamepad::A_PRESSED) == true) {
+       yaxis=yaxis-16;
+       }
+       wait(0.05);
+   //wait(0.1);
+   lcd.refresh();
+   lcd.clear();
     
-    }
\ No newline at end of file
+    }
+    
+    
+        
+    
\ No newline at end of file