Revision 8:c02c278320c0, committed 2020-05-14

Comitter:

yangzhenye

Date:

Thu May 14 18:30:55 2020 +0000

Parent:

7:a69ae964412c

Child:

9:a5a82b3d1102

Commit message:

el17zy

Changed in this revision

--- a/Menu/Menu.cpp	Thu May 14 17:19:27 2020 +0000
+++ b/Menu/Menu.cpp	Thu May 14 18:30:55 2020 +0000
@@ -94,7 +94,7 @@
    lcd.drawSprite(1,60,30,80,(int*)_sprite); }
    
 void  Menu::display_page2(N5110 &lcd, Gamepad &gamepad) {
-   lcd.printString("love you Tim!",0,0);
+   lcd.printString("It is Rooney turn!",0,0);
 }
    
 void  Menu::display_page3(N5110 &lcd, Gamepad &gamepad) {

--- a/RooneyEngine/RooneyEngine.cpp	Thu May 14 17:19:27 2020 +0000
+++ b/RooneyEngine/RooneyEngine.cpp	Thu May 14 18:30:55 2020 +0000
@@ -71,29 +71,29 @@
  //       lcd.drawRect(_x,_y,_size,_size,FILL_BLACK);
  //       }
 
-void RooneyEngine::update_lcd(N5110 &lcd) {
-        get_sprite();
-        sprintf(buffer,"%2d",_player_score);
-        lcd.printString("score",0,0);
-        lcd.printString(buffer,30,0); 
-        }
+//void RooneyEngine::update_lcd(N5110 &lcd) {
+ //       get_sprite();
+//        sprintf(buffer,"%2d",_player_score);
+ //       lcd.printString("score",0,0);
+  //      lcd.printString(buffer,30,0); 
+  //      }
 
-void RooneyEngine::get_rooney_x(Gamepad &gamepad) {
-    _speed=speed;
-     if (joy_x < float(-0.5){ 
-     _speed=-0.5;
-     _player_x=38+_speed;
-     else if (x<=0){
-         _speed = 0
-         }
-     }
-     if (joy_x > float(0.5){ 
-     _speed=0.5;
-     _player_x=38+_speed;
-     else if (x>=80){
-         _speed = 0
-         }
-        }
+//void RooneyEngine::get_rooney_x(Gamepad &gamepad) {
+ //   _speed=speed;
+//     if (joy_x < float(-0.5){ 
+ //    _speed=-0.5;
+//     _player_x=38+_speed;
+//     else if (x<=0){
+//         _speed = 0
+ //        }
+//     }
+ //    if (joy_x > float(0.5){ 
+ //    _speed=0.5;
+ //    _player_x=38+_speed;
+ //    else if (x>=80){
+ //        _speed = 0
+//         }
+//        }
         
 bool RooneyEngine::get_reset_flag() {
         return _reset_flag;
@@ -106,15 +106,15 @@
 void RooneyEngine::run_engine(N5110 &lcd, Gamepad &gamepad) {
     init();
     reset();
-    check_reset(N5110 &lcd, Gamepad &gamepad);
-    check_start(N5110 &lcd, Gamepad &gamepad);
-    check_collision(Gamepad &gamepad);
-    _player_score=get_score();
-    get_sprite();
-    update_lcd(N5110 &lcd);
+    check_reset(lcd, gamepad);
+    check_start(lcd, gamepad);
+    check_collision(gamepad);
+//    _player_score=get_score();
+ //   get_sprite();
+  //  update_lcd(lcd);
     get_reset_flag();
     get_start_flag();
-    get_rooney_x(Gamepad &gamepad);
+ //   get_rooney_x(gamepad);
     }        
         
         

--- a/RooneyEngine/RooneyEngine.h	Thu May 14 17:19:27 2020 +0000
+++ b/RooneyEngine/RooneyEngine.h	Thu May 14 18:30:55 2020 +0000
@@ -24,7 +24,7 @@
     void check_start(N5110 &lcd, Gamepad &gamepad);
     void check_collision(Gamepad &gamepad);
     void get_score();
-    void get_sprite();
+  //  void get_sprite();
     void update_lcd(N5110 &lcd);
     void run_engine(N5110 &lcd, Gamepad &gamepad);
     bool get_reset_flag();

--- a/main.cpp	Thu May 14 17:19:27 2020 +0000
+++ b/main.cpp	Thu May 14 18:30:55 2020 +0000
@@ -29,7 +29,7 @@
   lcd.setBrightness(0.5);
   while(1) {
     lcd.clear();  
-    _menu.run(lcd, gamepad);
+    _menu.run_engine(lcd, gamepad);
     lcd.refresh();
     wait(0.01); }    
 }