Diff: GameEngine/GameEngine.cpp

Revision:

7:06c86ec1f19d

Parent:

6:7b733b2a6cf6

Child:

8:13cef7cb872e

--- a/GameEngine/GameEngine.cpp	Fri Apr 20 21:03:05 2018 +0000
+++ b/GameEngine/GameEngine.cpp	Tue Apr 24 10:17:39 2018 +0000
@@ -27,7 +27,8 @@
     // draw the game elements in the LCD
     _rocket.draw(lcd);
     _asteroid.draw(lcd);
-    print_scores(lcd);
+    //print_scores(lcd);
+    print_scores1(lcd);
   
 }
 
@@ -45,19 +46,19 @@
     Vector2D _asteroid_pos = _asteroid.get_pos() ;
 
     Vector2D _rocket_pos = _rocket.get_pos();
-    
-    if (_rocket_pos.x+11 >=_asteroid_pos.x && _rocket_pos.x+9 <_asteroid_pos.x ) {//size //sprint width //float/////////////speed 
-        if(  _asteroid_pos.y >= _rocket_pos.y && _asteroid_pos.y <= _rocket_pos.y+7 || _asteroid_pos.y+7 >= _rocket_pos.y && _asteroid_pos.y+7 <= _rocket_pos.y+7 ){
-        _rocket.add_score();
-        pad.tone(1500.0,0.5);
-        pad.leds_on();
-        wait(0.5);
-        pad.leds_off();
+
+    if (_rocket_pos.x+11 >=_asteroid_pos.x && _rocket_pos.x+9 <_asteroid_pos.x ) {//size //sprint width //float/////////////speed
+        if(  _asteroid_pos.y >= _rocket_pos.y && _asteroid_pos.y <= _rocket_pos.y+7 || _asteroid_pos.y+7 >= _rocket_pos.y && _asteroid_pos.y+7 <= _rocket_pos.y+7 ) {
+            _rocket.add_score();
+            pad.tone(1500.0,0.5);
+            pad.leds_on();
+            wait(0.5);
+            pad.leds_off();
         }
-  }
+    }
 }
  //////////////////////////////////////////////////////////////////   
-void GameEngine::print_scores(N5110 &lcd)
+void GameEngine::print_scores(N5110 &lcd) //this function is not used now 
 {
     // get the number of hits
     int _rocket_score = _rocket.get_score();
@@ -66,4 +67,20 @@
     char buffer1[11];
     sprintf(buffer1,"hits:%2d",_rocket_score);
     lcd.printString(buffer1,WIDTH/2 - 20, 1);    
+}
+
+void GameEngine::print_scores1(N5110 &lcd)
+{
+    // get scores from Rocket
+    int _rocket_score = _rocket.get_score();
+    // get_score();
+    if (_rocket_score ==1) {
+        _rocket.drawTwoHearts(lcd);
+    } else if (_rocket_score==0) {
+        _rocket.drawFullHearts(lcd);
+    } else if (_rocket_score == 2) {
+        _rocket.drawOneHeart(lcd);
+    } else {
+        _rocket.drawOneHeart(lcd);
+    }
 }
\ No newline at end of file