diff --git a/include/elements.hpp b/include/elements.hpp index de624ef..c3d2ed2 100644 --- a/include/elements.hpp +++ b/include/elements.hpp @@ -1,10 +1,24 @@ #ifndef ELEMENTS_HPP #define ELEMENTS_HPP +struct Point; +struct Paddle; +struct Block; +struct Ball; +Paddle create_new_paddle(int size); + +enum Direction { + LEFT = -1, + RIGHT = 1, + NONE = 0, +}; + struct Point { Point(); + Point(int row, int col, char symbol) : m_row(row), m_col(col), m_symbol(symbol) {}; int m_row; int m_col; + char m_symbol; void assign(int row, int col); }; @@ -23,6 +37,7 @@ struct Paddle { Paddle(); int _size; Point m_nodes[3]; + enum Direction m_direction; void get_new_pos(); void check_collision(Ball &ball); }; diff --git a/include/globals.hpp b/include/globals.hpp index 0f14e1e..6210cac 100644 --- a/include/globals.hpp +++ b/include/globals.hpp @@ -1,7 +1,7 @@ #ifndef GLOBALS_HPP #define GLOBALS_HPP - -constexpr int ROW = 15; -constexpr int COL = 15; +#define ROW 15 +#define COL 15 +#define FPMS 300 #endif diff --git a/include/input.hpp b/include/input.hpp index 17ad117..86a06e1 100644 --- a/include/input.hpp +++ b/include/input.hpp @@ -3,8 +3,8 @@ #include "elements.hpp" struct Input { - char m_getch = ' '; - void get_input(bool &running, Paddle &paddle); + int m_getch; + void get_input(bool &running, enum Direction &dir); }; #endif // INPUT_HPP diff --git a/include/window.hpp b/include/window.hpp index 13f1605..ae68964 100644 --- a/include/window.hpp +++ b/include/window.hpp @@ -1,18 +1,21 @@ #ifndef WINDOW_HPP #define WINDOW_HPP -#include #include "globals.hpp" #include "elements.hpp" struct Window { Window(); - std::array, ROW> m_board = {}; + Point* m_board[ROW][COL] = {}; int m_lives; - void update_display(Paddle &paddle, Ball &ball, Block (&block_list)[15]); + // void update_display(Paddle &paddle, Ball &ball, Block (&block_list)[15]); void tick(int fps); void clear(); void terminate(Ball &ball, bool &running); + + void clear_display(); + void draw_display(int fps); + void update_display(Point** segments, int segments_size); }; #endif diff --git a/src/input.cpp b/src/input.cpp index e2de8f0..5271e8b 100644 --- a/src/input.cpp +++ b/src/input.cpp @@ -1,8 +1,7 @@ #include #include "input.hpp" -#include "globals.hpp" -void Input::get_input(bool &running, Paddle &paddle) { +void Input::get_input(bool &running, enum Direction &dir) { while(running) { initscr(); cbreak(); @@ -10,12 +9,17 @@ void Input::get_input(bool &running, Paddle &paddle) { m_getch = getch(); endwin(); - if(m_getch == 'a' && paddle.m_nodes[0].m_col > 0) { - paddle.m_nodes[0].m_col--; - m_getch = ' '; - } else if(m_getch == 'd' && paddle.m_nodes[paddle._size - 1].m_col < COL - 1) { - paddle.m_nodes[0].m_col++; - m_getch = ' '; - } if(m_getch == 'q') running = false; + switch (m_getch) { + case 67: + dir = RIGHT; + break; + case 68: + dir = LEFT; + break; + break; + case 113: + running = false; + break; + } } } diff --git a/src/main.cpp b/src/main.cpp index ac5d3fc..991f259 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,4 +1,5 @@ #include +#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; } diff --git a/src/window.cpp b/src/window.cpp index 2b36563..78fdf0c 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -26,24 +26,30 @@ void Window::terminate(Ball &ball, bool &running) { } } -void Window::update_display(Paddle &paddle, Ball &ball, Block (&block_list)[15]) { - for(std::array &row : m_board) { row.fill('.'); } - for(int i = 0; i < paddle._size; i++) { - m_board[paddle.m_nodes[i].m_row][paddle.m_nodes[i].m_col] = '-'; - } - for(int i = 0; i < 15; i++) { - for(int j = 0; j < block_list[i]._size; j++) { - m_board[block_list[i].m_nodes[j].m_row][block_list[i].m_nodes[j].m_col] = block_list[i].m_symbol; +void Window::clear_display() { + for(int i = 0; i < ROW; i++) { + for(int j = 0; j < COL; j++) { + m_board[i][j] = nullptr; } } - m_board[ball.m_origin.m_row][ball.m_origin.m_col] = '*'; - clear(); - for(std::array &row : m_board) { - for(char &col : row) { - std::cout << col << " "; +} + +void Window::update_display(Point** segments, int segments_size) { + for(int i = segments_size - 1; i >= 0; i--) { + if(segments[i] != nullptr) { + m_board[segments[i]->m_row][segments[i]->m_col] = segments[i]; + } + } +} + +void Window::draw_display(int fps) { + std::cout << "\033[H" << std::flush; + for(int i = 0; i < ROW; i++) { + for(int j = 0; j < COL; j++) { + if(m_board[i][j] != nullptr) std::cout << m_board[i][j]->m_symbol << " "; + else std::cout << ". "; } std::cout << "\r\n"; } - std::cout << "Lives left: " << m_lives << std::endl; - tick(150); + std::this_thread::sleep_for(std::chrono::milliseconds(fps)); }