Diff: main.cpp

Revision:

12:9e6d5d0a0c82

Parent:

11:4e2eb64031a0

Child:

13:feadff02d3f7

--- a/main.cpp	Sat Apr 13 16:31:43 2019 +0000
+++ b/main.cpp	Sun Apr 14 15:58:12 2019 +0000
@@ -12,9 +12,10 @@
 #include "Gamepad.h"
 #include "N5110.h"
 #include "Bitmap.h"
-#include "TankL.h"
+#include "Tank.h"
 #include "TanksEngine.h"
 #include "Projectile.h"
+#include "Graphics.h"
 #define PI 3.14159265
 #define DEG2PI 0.0174532925 
 
@@ -28,6 +29,7 @@
 N5110 lcd(PTC9,PTC0,PTC7,PTD2,PTD1,PTC11);
 TanksEngine engine;
 Gamepad pad;
+Graphics graphics;
 
 void welcome()
 {
@@ -53,16 +55,25 @@
 
     while(1) {  // infinite loop
     
-        lcd.clear();          
+        lcd.clear();  
+        engine.read_input(pad);        
         if (engine.get_turn() == 1) {
-            engine.left_tank_turn(pad, lcd);
-        } else if (engine.get_turn() == 2) {
-            engine.projectile_phase(lcd);
-        } else { int turn = 3; }// means nothing
+            engine.left_tank_turn(pad);
+        } else if (engine.get_turn() == 2 || engine.get_turn() == 4) {
+            engine.projectile_phase();
+        } else if (engine.get_turn() == 3) {
+            engine.right_tank_turn(pad); }
+       /* engine.end();
+        if (engine.get_turn() == 5) {
+            while (1) {
+                lcd.clear();
+                engine.render(graphics, lcd);
+                lcd.refresh();
+            }
+        }*/
+        engine.render(graphics, lcd);
         lcd.refresh();
-        wait_ms(16.666);
-
-        
+        wait_ms(frame_period_ms);      
     }
     /*
 lcd.clear();