Merge branch 'master' of git.olimp-nw.ru:cschool/Gamebox

Author: tsarn

VirtualGameBox/AVR.cpp

@@ -218,8 +218,11 @@ unsigned int AVR::popStack24() {
     return res;
 }
 
-AVR::AVR(Display &display) : rbank(), io(rbank, display), display(display) {
+AVR::AVR(Display &display, QObject *parent)
+    : QThread(parent), rbank(), io(rbank, display), display(display)
+{
     do_log = false;
+    exit = false;
     reset();
 }
 
@@ -1370,7 +1373,7 @@ void AVR::run() {
     clock_t start = clock();
     unsigned long long last_burst = 0;
 
-    while (true) {
+    while (!exit) {
         tick();
         if (rbank.getCycles() - last_burst >= FREQ / BURSTS_PER_SECOND) {
             clock_t end = clock();
@@ -1384,3 +1387,8 @@ void AVR::run() {
         }
     }
 }
+
+void AVR::stop()
+{
+    exit = true;
+}

VirtualGameBox/AVR.h

@@ -7,8 +7,12 @@
 #include "atmega2560.h"
 #include "periph/Display.h"
 #include <cstdint>
+#include <QWidget>
+
+class AVR : public QThread
+{
+    Q_OBJECT
 
-class AVR {
 public:
     std::array<uint16_t, FLASH_SIZE> flash;
     std::array<uint8_t, SRAM_SIZE> sram;
@@ -19,6 +23,7 @@ class AVR {
     AVRIO io;
     Display &display;
     bool do_log;
+    bool exit;
 
     uint8_t getData(uint16_t addr);
 
@@ -84,13 +89,14 @@ class AVR {
     unsigned int popStack24();
 
 public:
-    AVR(Display &display);
+    AVR(Display &display, QObject *parent = 0);
 
     void reset();
 
     unsigned int tick();
 
     void run();
+    void stop();
 };
 
 #endif // AVR_H

VirtualGameBox/Window.cpp

@@ -61,7 +61,12 @@ Window::Window(std::vector<uint8_t> &buf)
                 (((uint8_t)buf[i + 1]) << 8) | (uint8_t)buf[i];
     }
 
-    new std::thread(&AVR::run, &avr);
+    avr.start();
+}
+
+Window::~Window()
+{
+    avr.stop();
 }
 
 void Window::updateScreen()

VirtualGameBox/Window.h

@@ -28,6 +28,7 @@ class Window : public QWidget
 
 public:
     Window(std::vector<uint8_t> &buf);
+    virtual ~Window();
 
 private slots:
     void updateScreen();

game/Snail.cpp

@@ -316,7 +316,7 @@ static void Snail_prepare()
     data->y = 0;
     data->btn_timeout = 0;
     data->state = GS_MENU;
-    data->menu = menu_setup(level_menu, 0, 0, BLUE_DARK);
+    data->menu = menu_setup(level_menu);
 }
 
 void Snail_move(int dx, int dy)
@@ -397,6 +397,7 @@ static void Snail_update(unsigned long delta)
     data->btn_timeout = 0;
     if (game_is_button_pressed(MENU))
     {
+        game_draw_rect(0, 0, WIDTH, HEIGHT, BLACK);
         data->state = GS_MENU;
         return;
     }