wip

CMakeLists.txt

@@ -1,7 +1,8 @@
 cmake_minimum_required(VERSION 3.16)
 project(breakout)
-set(CMAKE_C_STANDARD 23)
+set(CMAKE_CXX_STANDARD 23)
-set(CMAKE_C_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 include_directories(include)
 
 set(SOURCES
@@ -16,5 +17,3 @@ add_executable(breakout ${SOURCES})
 find_package(Curses REQUIRED)
 include_directories(${CURSES_INCLUDE_DIR})
 target_link_libraries(breakout ${CURSES_LIBRARIES})
-
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

include/elements.hpp

@@ -7,7 +7,8 @@ struct Point;
 struct Paddle;
 struct Block;
 struct Ball;
-Paddle create_new_paddle(Point** segments, int index, int size, int row, char symbol);
+Paddle create_new_paddle(Point** buffer, int starting_array_index, int size, int row, char symbol);
+Block create_new_block(Point** buffer, char symbol, int row, int col, int length);
 
 enum Direction {
 	LEFT = -1,
@@ -22,7 +23,6 @@ struct Point {
 	int m_col;
 	char m_symbol;
 	void assign(int row, int col);
-	void to_string();
 };
 
 struct Ball {

include/window.hpp

@@ -15,7 +15,7 @@ struct Window {
 
 	void clear_display();
 	void draw_display(int fps);
-	void update_display(Point** segments, int segments_size);
+	void update_display(Point** buffer, int buffer_size);
 };
 
 #endif

src/elements.cpp

@@ -1,4 +1,3 @@
-#include <iostream>
 #include "elements.hpp"
 #include "globals.hpp"
 
@@ -7,23 +6,18 @@ Point::Point() {
 	m_col = 0;
 }
 
-void Point::to_string() {
-	std::cout << "(" << m_row << ", " << m_col <<  ")\n";
-}
-
 void Point::assign(int row, int col) {
 	m_row = row;
 	m_col = col;
 }
 
-Paddle create_new_paddle(Point** segments, int index, int size, int row, char symbol) {
+Paddle create_new_paddle(Point** buffer, int starting_array_index, int size, int row, char symbol) {
 	Paddle paddle { size };
 	paddle._size = size;
 	paddle.m_nodes = new Point*[size];
 	for(int i = 0; i < size; i++) {
 		paddle.m_nodes[i] = new Point { row, ((COL / 2) - (size / 2)) + i, symbol };
-		// paddle.m_nodes[i] = new Point { row, ((COL / 2) - (size / 2) - 1) + i, symbol };
+		buffer[i + starting_array_index] = paddle.m_nodes[i];
-		segments[i + index] = paddle.m_nodes[i];
 	}
 
 	return paddle;

src/main.cpp

@@ -10,9 +10,8 @@ int main(int argc, char **argv) {
 	Window window;
 	// Ball ball;
 
-	Point* segments[50] = {};
+	Point* buffer[50] = {};
-	// segments[1] = new Point { 2, 5, '*' };
+	Paddle paddle = create_new_paddle(buffer, 1, 3, ROW - 2, '-');
-	Paddle paddle = create_new_paddle(segments, 0, 3, ROW - 2, '*');
 
 	// Block block_list[15] = {
 	// 	Block('3', 1, 0), Block('3', 1, 3), Block('3', 1, 6), Block('3', 1, 9), Block('3', 1, 12),
@@ -30,8 +29,8 @@ int main(int argc, char **argv) {
 		// 		paddle.m_direction = RIGHT;
 		// 	}
 		// for(int i = 0; i < 10; i++) {
-		// 	if(segments[i] == nullptr) continue;
+		// 	if(buffer[i] == nullptr) continue;
-		// 	segments[i]->to_string();
+		// 	buffer[i]->to_string();
 		// }
 		// ball.check_collision();
 		// for(int i = 0; i < 15; i++) {
@@ -54,13 +53,13 @@ int main(int argc, char **argv) {
 		// window.terminate(ball, running);
 		paddle.determine_new_position(window.m_board);
 		window.clear_display();
-		window.update_display(segments, 50);
+		window.update_display(buffer, 50);
 		window.draw_display(FPMS);
 	}
 	input_thread.join();
 	for(int i = 0; i < 50; i++) {
-		if(segments[i] == nullptr) continue;
+		if(buffer[i] == nullptr) continue;
-		delete segments[i];
+		delete buffer[i];
 	}
 	return 0;
 }

src/window.cpp

@@ -34,10 +34,10 @@ void Window::clear_display() {
 	}
 }
 
-void Window::update_display(Point** segments, int segments_size) {
+void Window::update_display(Point** buffer, int buffer_size) {
-	for(int i = segments_size - 1; i >= 0; i--) {
+	for(int i = buffer_size - 1; i >= 0; i--) {
-		if(segments[i] != nullptr) {
+		if(buffer[i] != nullptr) {
-			m_board[segments[i]->m_row][segments[i]->m_col] = segments[i];
+			m_board[buffer[i]->m_row][buffer[i]->m_col] = buffer[i];
 		}
 	}
 }