moving a bunch of things around
This commit is contained in:
+104
-27
@@ -1,5 +1,83 @@
|
||||
#include <engine.hpp>
|
||||
#include <ncurses.h>
|
||||
#include "globals.hpp"
|
||||
#include <iostream>
|
||||
#include <chrono>
|
||||
#include <thread>
|
||||
|
||||
void Window::clear_display() {
|
||||
for(int i = 0; i < ROW; i++) {
|
||||
for(int j = 0; j < COL; j++) {
|
||||
view[i][j] = '.';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Window::update_board(Paddle paddle, Ball ball) {
|
||||
for(int i = 0; i < paddle.m_nodes.size(); i++) {
|
||||
view[paddle.m_nodes[i].y][paddle.m_nodes[i].x] = paddle.m_nodes[i].m_symbol;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
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(view[i][j] != '.') std::cout << view[i][j] << " ";
|
||||
else std::cout << ". ";
|
||||
}
|
||||
std::cout << "\r\n";
|
||||
}
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(fps));
|
||||
}
|
||||
|
||||
Engine::Engine() {
|
||||
initscr();
|
||||
cbreak();
|
||||
noecho();
|
||||
nodelay(stdscr, true);
|
||||
}
|
||||
|
||||
Engine::~Engine() {
|
||||
endwin();
|
||||
}
|
||||
|
||||
void Engine::run() {
|
||||
// const int buffer_size = 50, block_buffer_size = 15;
|
||||
// vec2* buffer[buffer_size] = {};
|
||||
|
||||
// Ball ball = create_new_ball(buffer, 0, 1, -1, (ROW - 5), (COL / 2), '*' );
|
||||
// Paddle paddle = create_new_paddle(buffer, 1, 3, ROW - 2, '-');
|
||||
// Block** block_buffer = create_block_buffer('3', 3, 5, 3);
|
||||
// rasterize_buffer(buffer, block_buffer, 4);
|
||||
|
||||
std::thread input_thread([&] { input.get_input(running, paddle.m_direction); } );
|
||||
|
||||
while (process_input() && quit_if()) {
|
||||
paddle.determine_new_position(win.view);
|
||||
paddle.check_collision(ball);
|
||||
// trim_block_buffer_on_collision(buffer, buffer_size, block_buffer, block_buffer_size, ball);
|
||||
ball.determine_new_position(paddle.m_hearts, (ROW - 5), (COL / 2));
|
||||
win.clear_display();
|
||||
win.update_board(paddle, ball);
|
||||
win.draw_display(FPMS);
|
||||
if(paddle.m_hearts <= 0) {
|
||||
running = false;
|
||||
std::cout << "No Hearts left! You lose!\n";
|
||||
}
|
||||
// if(is_block_buffer_empty(block_buffer, block_buffer_size)) {
|
||||
// running = false;
|
||||
// std::cout << "No Blocks left! You win!\n";
|
||||
// }
|
||||
std::cout << "Hearts left: " << paddle.m_hearts << "\n";
|
||||
}
|
||||
|
||||
input_thread.join();
|
||||
// cleanup(block_buffer, block_buffer_size);
|
||||
|
||||
|
||||
}
|
||||
|
||||
// Block** create_block_buffer(int starting_symbol, int rows, int cols, int length) {
|
||||
// Block** block_buffer = new Block*[rows * cols];
|
||||
@@ -61,28 +139,27 @@
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
//
|
||||
Paddle::Paddle() {
|
||||
for(int i = 0; i < m_nodes.size(); i++) {
|
||||
m_nodes[i].set(COL -2 , (ROW / 2) - (m_nodes.size() - i));
|
||||
m_nodes[i].set((COL - 2) - (m_nodes.size() - i), ROW - 2);
|
||||
m_nodes[i].m_symbol = '-';
|
||||
}
|
||||
}
|
||||
|
||||
void Paddle::determine_new_position(char (*board)[COL]) {
|
||||
if(m_direction == LEFT && m_nodes[0].x - 1 >= 0) {
|
||||
m_nodes[0].x--;
|
||||
for(int i = 1; i < _size; i++) {
|
||||
m_nodes[i].x = m_nodes[0].x + i;
|
||||
}
|
||||
if(dir == Direction::LEFT || dir == Direction::RIGHT) return;
|
||||
if(dir == Direction::LEFT && m_nodes[0].x - 1 >= 0) {
|
||||
m_nodes.front().x--;
|
||||
}
|
||||
else if(m_direction == RIGHT && m_nodes[_size - 1].x + 1 < ROW) {
|
||||
m_nodes[_size - 1].x++;
|
||||
for(int i = 1; i < _size; i++) {
|
||||
m_nodes[_size - (i + 1)].x = m_nodes[_size - 1].x - i;
|
||||
}
|
||||
if(dir == Direction::RIGHT && m_nodes.back().x + 1 < ROW) {
|
||||
m_nodes.front().x++;
|
||||
}
|
||||
m_direction = NONE;
|
||||
for(int i = 1; i < m_nodes.size(); i++) {
|
||||
m_nodes[i].set(m_nodes.front().x - (m_nodes.size() - i), ROW - 2);
|
||||
m_nodes[i].m_symbol = '-';
|
||||
}
|
||||
dir = Direction::NONE;
|
||||
}
|
||||
|
||||
void Paddle::check_collision(Ball &ball) {
|
||||
@@ -114,17 +191,17 @@ void Ball::determine_new_position(int &paddle_lives, int reset_ball_x, int reset
|
||||
m_origin.y += vel.y;
|
||||
}
|
||||
|
||||
Block::Block(vec2 pos, char symbol) {
|
||||
for(int i = 0; i < m_nodes.size(); i++) {
|
||||
m_nodes[i].set(pos.x + i, pos.y);
|
||||
m_nodes[i].m_symbol = symbol;
|
||||
}
|
||||
}
|
||||
|
||||
bool Block::check_collision(Ball &ball) {
|
||||
for(int i = 0; i < m_nodes.size(); i++) {
|
||||
if(m_nodes[i] != ball.m_origin) continue;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
// Block::Block(vec2 pos, char symbol) {
|
||||
// for(int i = 0; i < m_nodes.size(); i++) {
|
||||
// m_nodes[i].set(pos.x + i, pos.y);
|
||||
// m_nodes[i].m_symbol = symbol;
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// bool Block::check_collision(Ball &ball) {
|
||||
// for(int i = 0; i < m_nodes.size(); i++) {
|
||||
// if(m_nodes[i] != ball.m_origin) continue;
|
||||
// return true;
|
||||
// }
|
||||
// return false;
|
||||
// }
|
||||
|
||||
Reference in New Issue
Block a user