This commit is contained in:
DarthMooMancer
2025-09-28 18:00:34 -04:00
parent 6529353f2f
commit a0b29a40d1
7 changed files with 96 additions and 57 deletions
+36 -25
View File
@@ -1,4 +1,5 @@
#include <thread>
#include "globals.hpp"
#include "input.hpp"
#include "window.hpp"
#include "elements.hpp"
@@ -8,38 +9,48 @@ int main() {
Window window;
Paddle paddle;
Ball ball;
Block block_list[15] = {
Block('3', 1, 0), Block('3', 1, 3), Block('3', 1, 6), Block('3', 1, 9), Block('3', 1, 12),
Block('2', 2, 0), Block('2', 2, 3), Block('2', 2, 6), Block('2', 2, 9), Block('2', 2, 12),
Block('1', 3, 0), Block('1', 3, 3), Block('1', 3, 6), Block('1', 3, 9), Block('1', 3, 12),
};
Point* segments[50] = {};
segments[1] = new Point { 2, 5, '*' };
// Block block_list[15] = {
// Block('3', 1, 0), Block('3', 1, 3), Block('3', 1, 6), Block('3', 1, 9), Block('3', 1, 12),
// Block('2', 2, 0), Block('2', 2, 3), Block('2', 2, 6), Block('2', 2, 9), Block('2', 2, 12),
// Block('1', 3, 0), Block('1', 3, 3), Block('1', 3, 6), Block('1', 3, 9), Block('1', 3, 12),
// };
bool running = true;
std::thread input_thread(&Input::get_input, &input, std::ref(running), std::ref(paddle));
std::thread input_thread([&] { input.get_input(running, paddle.m_direction); } );
while (running) {
window.update_display(paddle, ball, block_list);
// window.update_display(paddle, ball, block_list);
paddle.get_new_pos();
ball.check_collision();
for(int i = 0; i < 15; i++) {
if(block_list[i]._deleted) {
continue;
}
block_list[i].get_pos();
block_list[i].check_collision(ball, ball.m_blocks_left);
}
if(ball.m_origin.m_row >= ROW -1) {
window.m_lives--;
ball.m_origin.assign(ROW - 7, (COL / 2));
ball.change_velocity('y');
window.update_display(paddle, ball, block_list);
window.tick(500);
}
// ball.check_collision();
// for(int i = 0; i < 15; i++) {
// if(block_list[i]._deleted) {
// continue;
// }
// block_list[i].get_pos();
// block_list[i].check_collision(ball, ball.m_blocks_left);
// }
// if(ball.m_origin.m_row >= ROW -1) {
// window.m_lives--;
// ball.m_origin.assign(ROW - 7, (COL / 2));
// ball.change_velocity('y');
// // window.update_display(paddle, ball, block_list);
// window.tick(FPMS);
// }
paddle.check_collision(ball);
ball.get_new_pos();
window.terminate(ball, running);
// paddle.check_collision(ball);
// ball.get_new_pos();
// window.terminate(ball, running);
window.clear_display();
window.update_display(segments, 50);
window.draw_display(FPMS);
}
input_thread.join();
for(int i = 0; i < 50; i++) {
if(segments[i] == nullptr) continue;
delete segments[i];
}
return 0;
}