blocks and colors

CMakeLists.txt

@@ -27,6 +27,11 @@ add_executable(${PROJECT_NAME} ${PROJECT_SOURCES}
         src/main.cpp
         src/grid.h
         src/grid.cpp
+        src/block.h
+        src/position.h
+        src/position.cpp
+        src/colors.h
+        src/colors.cpp
 )
 target_sources(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCES})
 target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_INCLUDE})

src/block.h

@@ -0,0 +1,23 @@
+//
+// Created by Michael Bui on 12/2/24.
+//
+
+#ifndef BLOCK_H
+#define BLOCK_H
+
+#pragma once
+#include <vector>
+#include <map>
+#include "position.h"
+
+class Block {
+public:
+    Block();
+    int id;
+    std::map<int, std::vector<Position>> cells;
+private:
+    int cellSize;
+    int roationState;
+};
+
+#endif //BLOCK_H

src/colors.cpp

@@ -0,0 +1,20 @@
+//
+// Created by Michael Bui on 12/2/24.
+//
+
+#include "colors.h"
+
+#include <vector>
+
+const Color darkGray = {26, 31, 40, 255};
+const Color green = {47, 230, 23, 255};
+const Color red = {232, 18, 18, 255};
+const Color orange = {226, 116, 17, 255};
+const Color yellow = {237, 234, 4, 255};
+const Color purple = {166, 0, 247, 255};
+const Color cyan = {21, 204, 209, 255};
+const Color blue = {13, 64, 216, 255};
+
+std::vector<Color> GetCellColors() {
+    return {darkGray, green, red, orange, yellow, purple, cyan, blue};
+}

src/colors.h

@@ -0,0 +1,23 @@
+//
+// Created by Michael Bui on 12/2/24.
+//
+
+#ifndef COLOURS_H
+#define COLOURS_H
+
+#pragma once
+#include <raylib.h>
+#include <vector>
+
+extern const Color darkGray;
+extern const Color green;
+extern const Color red;
+extern const Color orange;
+extern const Color yellow;
+extern const Color purple;
+extern const Color cyan;
+extern const Color blue;
+
+std::vector<Color> GetCellColors();
+
+#endif //COLOURS_H

src/grid.cpp

@@ -4,6 +4,7 @@
 
 #include "grid.h"
 #include <iostream>
+#include "colors.h"
 
 Grid::Grid() {
     numRows = 20;
@@ -30,19 +31,6 @@ void Grid::print() {
     }
 }
 
-std::vector<Color> Grid::GetCellColors() {
-    Color darkGrey = {26, 31, 40, 255};
-    Color green = {47, 230, 23, 255};
-    Color red = {232, 18, 18, 255};
-    Color orange = {226, 116, 17, 255};
-    Color yellow = {237, 234, 4, 255};
-    Color purple = {166, 0, 247, 255};
-    Color cyan = {21, 204, 209, 255};
-    Color blue = {13, 64, 216, 255};
-
-    return {darkGrey, green, red, orange, yellow, purple, cyan, blue};
-}
-
 void Grid::Draw() {
     for (int row = 0; row < numRows; ++row) {
         for (int column = 0; column < numCols; ++column) {

src/grid.h

@@ -17,8 +17,6 @@ class Grid {
     void Draw();
     int grid[20][10];
 private:
-    std::vector<Color> GetCellColors();
-
     int numRows;
     int numCols;
     int cellSize;

src/position.cpp

@@ -0,0 +1,10 @@
+//
+// Created by Michael Bui on 12/2/24.
+//
+
+#include "position.h"
+
+Position::Position(int row, int column) {
+    this -> row = row;
+    this -> column = column;
+}

src/position.h

@@ -0,0 +1,16 @@
+//
+// Created by Michael Bui on 12/2/24.
+//
+
+#ifndef POSITION_H
+#define POSITION_H
+
+#pragma once
+class Position {
+public:
+    Position(int row, int column);
+    int row;
+    int column;
+};
+
+#endif //POSITION_H