This commit is contained in:
DarthMooMancer
2025-10-05 21:06:33 -04:00
parent b96acc766e
commit d8a3fee987
9 changed files with 138 additions and 129 deletions
-1
View File
@@ -1 +0,0 @@
compile_commands.json
+23 -22
View File
@@ -2,32 +2,33 @@
#define ELEMENTS_HPP #define ELEMENTS_HPP
struct Point { struct Point {
Point(int row, int col) : m_row(row), m_col(col) {}; Point(int row, int col, char symbol) : m_row(row), m_col(col), m_symbol(symbol) {};
int m_row; int m_row;
int m_col; int m_col;
char m_symbol;
void assign(int row, int col); void assign(int row, int col);
}; };
struct Tile { // struct Tile {
Tile(int row, int col) : m_pos(row, col), m_symbol(' '), _delete(false) {}; // Tile(int row, int col) : m_pos(row, col), m_symbol(' '), _delete(false) {};
Tile(int row, int col, char symbol) : m_pos(row, col), m_symbol(symbol), _delete(false) {}; // Tile(int row, int col, char symbol) : m_pos(row, col), m_symbol(symbol), _delete(false) {};
char m_symbol; // char m_symbol;
Point m_pos; // Point m_pos;
bool _delete; // bool _delete;
}; // };
//
struct Border { // struct Border {
Border(int row, int col, char symbol) : m_pos(row, col), m_symbol(symbol) {}; // Border(int row, int col, char symbol) : m_pos(row, col), m_symbol(symbol) {};
char m_symbol; // char m_symbol;
Point m_pos; // Point m_pos;
}; // };
//
struct Player { // struct Player {
Player(char symbol, bool turn) : m_symbol(symbol), m_turn(turn), m_win(false) {}; // Player(char symbol, bool turn) : m_symbol(symbol), m_turn(turn), m_win(false) {};
char m_symbol; // char m_symbol;
bool m_turn; // bool m_turn;
bool m_win; // bool m_win;
void check_line(Tile (&tile_list)[9]); // void check_line(Tile (&tile_list)[9]);
}; // };
#endif #endif
+3 -3
View File
@@ -1,7 +1,7 @@
#ifndef GLOBALS_HPP #ifndef GLOBALS_HPP
#define GLOBALS_HPP #define GLOBALS_HPP
#define ROW 5
constexpr int ROW = 5; #define COL 5
constexpr int COL = 5; #define FMPS 150
#endif #endif
+2 -1
View File
@@ -4,7 +4,8 @@
struct Input { struct Input {
int _getch = 0; int _getch = 0;
void get_input(bool &running, Tile (&tile_list)[9], Player &player_one, Player &player_two); // void get_input(bool &running, Tile (&tile_list)[9], Player &player_one, Player &player_two);
void get_input(bool &running);
}; };
#endif #endif
+6 -4
View File
@@ -1,14 +1,16 @@
#ifndef WINDOW_HPP #ifndef WINDOW_HPP
#define WINDOW_HPP #define WINDOW_HPP
#include <array>
#include "globals.hpp" #include "globals.hpp"
#include "elements.hpp" #include "elements.hpp"
struct Window { struct Window {
std::array<std::array<char, COL>, ROW> m_board = {}; Point* m_board[ROW][COL] = {};
void update_display(Tile (&tile_list)[9], Border (&border_list)[16]); // void terminate(Tile (&tile_list)[9], bool &running);
void terminate(Tile (&tile_list)[9], bool &running);
void clear_display();
void update_display(Point** buffer);
void draw_display(int fps);
}; };
#endif #endif
+22 -18
View File
@@ -1,21 +1,25 @@
#include "elements.hpp" #include "elements.hpp"
void Player::check_line(Tile (&tile_list)[9]) { void cleanup(Point** buffer) {
for(int i = 0; i <= 6; i += 3) {
if(tile_list[i].m_symbol == tile_list[i+1].m_symbol && tile_list[i+1].m_symbol == tile_list[i+2].m_symbol) {
if(tile_list[i].m_symbol == m_symbol) {
m_win = true;
}
}
}
if(tile_list[0].m_symbol == tile_list[4].m_symbol && tile_list[4].m_symbol == tile_list[8].m_symbol) {
if(tile_list[0].m_symbol == m_symbol) {
m_win = true;
}
}
if(tile_list[2].m_symbol == tile_list[4].m_symbol && tile_list[4].m_symbol == tile_list[6].m_symbol) {
if(tile_list[2].m_symbol == m_symbol) {
m_win = true;
}
}
} }
// void Player::check_line(Tile (&tile_list)[9]) {
// for(int i = 0; i <= 6; i += 3) {
// if(tile_list[i].m_symbol == tile_list[i+1].m_symbol && tile_list[i+1].m_symbol == tile_list[i+2].m_symbol) {
// if(tile_list[i].m_symbol == m_symbol) {
// m_win = true;
// }
// }
// }
// if(tile_list[0].m_symbol == tile_list[4].m_symbol && tile_list[4].m_symbol == tile_list[8].m_symbol) {
// if(tile_list[0].m_symbol == m_symbol) {
// m_win = true;
// }
// }
// if(tile_list[2].m_symbol == tile_list[4].m_symbol && tile_list[4].m_symbol == tile_list[6].m_symbol) {
// if(tile_list[2].m_symbol == m_symbol) {
// m_win = true;
// }
// }
// }
+11 -21
View File
@@ -1,17 +1,18 @@
#include <ncurses.h> #include <ncurses.h>
#include "input.hpp" #include "input.hpp"
void _switch_turn(int favor, Player &player_one, Player &player_two) { // void _switch_turn(int favor, Player &player_one, Player &player_two) {
if(favor == 1) { // if(favor == 1) {
player_one.m_turn = true; // player_one.m_turn = true;
player_two.m_turn = false; // player_two.m_turn = false;
} else if(favor == 2) { // } else if(favor == 2) {
player_one.m_turn = false; // player_one.m_turn = false;
player_two.m_turn = true; // player_two.m_turn = true;
} // }
} // }
void Input::get_input(bool &running, Tile (&tile_list)[9], Player &player_one, Player &player_two) { // void Input::get_input(bool &running, Tile (&tile_list)[9], Player &player_one, Player &player_two) {
void Input::get_input(bool &running) {
while(running) { while(running) {
initscr(); initscr();
cbreak(); cbreak();
@@ -23,16 +24,5 @@ void Input::get_input(bool &running, Tile (&tile_list)[9], Player &player_one, P
if(_getch == 113) { if(_getch == 113) {
running = false; running = false;
} }
if(!tile_list[_getch - 49]._delete) {
if(player_one.m_turn) {
tile_list[_getch - 49].m_symbol = player_one.m_symbol;
_switch_turn(2, player_one, player_two);
} else if(player_two.m_turn) {
tile_list[_getch - 49].m_symbol = player_two.m_symbol;
_switch_turn(1, player_one, player_two);
}
tile_list[_getch - 49]._delete = true;
_getch = 48;
}
} }
} }
+36 -32
View File
@@ -7,44 +7,48 @@
int main() { int main() {
Input input; Input input;
Window window; Window window;
Player player_one('x', true); // Player player_one('x', true);
Player player_two('o', false); // Player player_two('o', false);
bool running = true; bool running = true;
int count = 0; int count = 0;
Point* buffer[ROW * COL] = {};
Tile tile_list[9] = { // Tile tile_list[9] = {
Tile(0, 0), Tile(0, 2), Tile(0, 4), // Tile(0, 0), Tile(0, 2), Tile(0, 4),
Tile(2, 0), Tile(2, 2), Tile(2, 4), // Tile(2, 0), Tile(2, 2), Tile(2, 4),
Tile(4, 0), Tile(4, 2), Tile(4, 4) // Tile(4, 0), Tile(4, 2), Tile(4, 4)
}; // };
//
// Border border_list[16] = {
// Border(0, 1, '|'), Border(0, 3, '|'),
// Border(1, 0, '-'), Border(1, 1, '+'), Border(1, 2, '-'), Border(1, 3, '+'), Border(1, 4, '-'),
// Border(2, 1, '|'), Border(2, 3, '|'),
// Border(3, 0, '-'), Border(3, 1, '+'), Border(3, 2, '-'), Border(3, 3, '+'), Border(3, 4, '-'),
// Border(4, 1, '|'), Border(4, 3, '|'),
// };
Border border_list[16] = { std::thread input_thread([&] { input.get_input(running); } );
Border(0, 1, '|'), Border(0, 3, '|'),
Border(1, 0, '-'), Border(1, 1, '+'), Border(1, 2, '-'), Border(1, 3, '+'), Border(1, 4, '-'),
Border(2, 1, '|'), Border(2, 3, '|'),
Border(3, 0, '-'), Border(3, 1, '+'), Border(3, 2, '-'), Border(3, 3, '+'), Border(3, 4, '-'),
Border(4, 1, '|'), Border(4, 3, '|'),
};
std::thread input_thread(&Input::get_input, &input, std::ref(running), std::ref(tile_list), std::ref(player_one), std::ref(player_two));
while (running) { while (running) {
window.terminate(tile_list, running); window.clear_display();
window.update_display(tile_list, border_list); window.update_display(buffer);
player_one.check_line(tile_list); window.draw_display(150);
player_two.check_line(tile_list); // window.terminate(tile_list, running);
if(player_one.m_win) { // window.update_display(tile_list, border_list);
running = false; // player_one.check_line(tile_list);
std::cout << "Game Over! Player 1 wins!" << std::endl; // player_two.check_line(tile_list);
} else if(player_two.m_win) { // if(player_one.m_win) {
running = false; // running = false;
std::cout << "Game Over! Player 2 wins!" << std::endl; // std::cout << "Game Over! Player 1 wins!" << std::endl;
} // } else if(player_two.m_win) {
if(player_one.m_turn) { // running = false;
std::cout << "Current Player: " << player_one.m_symbol << std::endl; // std::cout << "Game Over! Player 2 wins!" << std::endl;
} if(player_two.m_turn) { // }
std::cout << "Current Player: " << player_two.m_symbol << std::endl; // if(player_one.m_turn) {
} // std::cout << "Current Player: " << player_one.m_symbol << std::endl;
// } if(player_two.m_turn) {
// std::cout << "Current Player: " << player_two.m_symbol << std::endl;
// }
} }
input_thread.join(); input_thread.join();
+35 -27
View File
@@ -3,38 +3,46 @@
#include <chrono> #include <chrono>
#include <thread> #include <thread>
void Window::terminate(Tile (&tile_list)[9], bool &running) { // void Window::terminate(Tile (&tile_list)[9], bool &running) {
if(tile_list[0]._delete && tile_list[0].m_symbol != ' ' // if(tile_list[0]._delete && tile_list[0].m_symbol != ' '
&& tile_list[1]._delete && tile_list[1].m_symbol != ' ' // && tile_list[1]._delete && tile_list[1].m_symbol != ' '
&& tile_list[2]._delete && tile_list[2].m_symbol != ' ' // && tile_list[2]._delete && tile_list[2].m_symbol != ' '
&& tile_list[3]._delete && tile_list[3].m_symbol != ' ' // && tile_list[3]._delete && tile_list[3].m_symbol != ' '
&& tile_list[4]._delete && tile_list[4].m_symbol != ' ' // && tile_list[4]._delete && tile_list[4].m_symbol != ' '
&& tile_list[5]._delete && tile_list[5].m_symbol != ' ' // && tile_list[5]._delete && tile_list[5].m_symbol != ' '
&& tile_list[6]._delete && tile_list[6].m_symbol != ' ' // && tile_list[6]._delete && tile_list[6].m_symbol != ' '
&& tile_list[7]._delete && tile_list[7].m_symbol != ' ' // && tile_list[7]._delete && tile_list[7].m_symbol != ' '
&& tile_list[8]._delete && tile_list[8].m_symbol != ' ') { // && tile_list[8]._delete && tile_list[8].m_symbol != ' ') {
std::cout << "Game Over! Tie" << std::endl; // std::cout << "Game Over! Tie" << std::endl;
running = false; // running = false;
//
// }
// }
void Window::clear_display() {
for(int i = 0; i < ROW; i++) {
for(int j = 0; j < COL; j++) {
m_board[i][j] = nullptr;
}
} }
} }
void Window::update_display(Tile (&tile_list)[9], Border (&border_list)[16]) { void Window::draw_display(int milliseconds) {
for(std::array<char, COL> &row : m_board) { row.fill('.'); } std::cout << "\033[H" << std::flush; // Clear screen
for(int i = 0; i < ROW; i++) {
for(int i = 0; i < 9; i++) { for(int j = 0; j < ROW; j++) {
m_board[tile_list[i].m_pos.m_row][tile_list[i].m_pos.m_col] = tile_list[i].m_symbol; if(m_board[i][j] == nullptr) { std::cout << ". "; }
} if(m_board[i][j] != nullptr) { std::cout << m_board[i][j]->m_symbol << " "; }
for(int i = 0; i < 16; i++) {
m_board[border_list[i].m_pos.m_row][border_list[i].m_pos.m_col] = border_list[i].m_symbol;
}
std::cout << "\033[H" << std::flush;
for(std::array<char, COL> &row : m_board) {
for(char &col : row) {
std::cout << col << " ";
} }
std::cout << "\r\n"; std::cout << "\r\n";
} }
std::this_thread::sleep_for(std::chrono::milliseconds(200)); // 1000 / fps; 200ms = 5fps std::this_thread::sleep_for(std::chrono::milliseconds((int) (milliseconds))); // 1000 / fps; 200ms = 5fps
}
void Window::update_display(Point** buffer) {
for(int i = 0; i < ROW * COL; i++) {
if(buffer[i] != nullptr) {
m_board[buffer[i]->m_row][buffer[i]->m_col] = buffer[i];
}
}
} }