summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlessandro Iezzi <aiezzi@alessandroiezzi.it>2025-05-21 17:00:19 +0200
committerAlessandro Iezzi <aiezzi@alessandroiezzi.it>2025-05-21 17:13:23 +0200
commit0e8e745f88617fe5933eb7981198ac24cb7b1ee4 (patch)
tree834d6414217ee9c4d073eb68cbe26ba9bb42c6b2
parent25c0bda9ca1e436370a9e2a671d3195de0e90902 (diff)
downloadtris-0e8e745f88617fe5933eb7981198ac24cb7b1ee4.tar.gz
tris-0e8e745f88617fe5933eb7981198ac24cb7b1ee4.zip
Add the Cell struct
-rw-r--r--CMakeLists.txt4
-rw-r--r--src/main/game/cell.c45
-rw-r--r--src/main/game/cell.h32
-rw-r--r--src/main/game/game.c1
-rw-r--r--src/main/game/game.h4
5 files changed, 81 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 21ad1bc..71d5913 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,6 +39,8 @@ add_executable(tris
src/main/util/list.h
src/main/util/list.c
src/main/engine/ui/types.h
- src/main/engine/types.h)
+ src/main/engine/types.h
+ src/main/game/cell.h
+ src/main/game/cell.c)
target_link_libraries(tris PRIVATE X11 GL GLX m)
diff --git a/src/main/game/cell.c b/src/main/game/cell.c
new file mode 100644
index 0000000..892dd47
--- /dev/null
+++ b/src/main/game/cell.c
@@ -0,0 +1,45 @@
+/*-
+ * Copyright (C) 2025 Alessandro Iezzi <aiezzi AT alessandroiezzi PERIOD it>
+ *
+ * This file is part of Tris Game.
+ *
+ * Tris Game is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Tris Game is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Tris Game. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdlib.h>
+#include <stdbool.h>
+#include "cell.h"
+#include "../util.h"
+
+Cell *
+cell_new(float left, float right, float top, float bottom)
+{
+ Cell *cell = malloc(sizeof(Cell));
+ if (cell == NULL) {
+ log_error("Error allocating memory for cell");
+ exit(EXIT_FAILURE);
+ }
+ cell->left = left;
+ cell->right = right;
+ cell->top = top;
+ cell->bottom = bottom;
+
+ return cell;
+}
+
+bool
+cell_within_bounds(Cell *cell, float x, float y)
+{
+ return x >= cell->left && x <= cell->right && y <= cell->top && y >= cell->bottom;
+}
diff --git a/src/main/game/cell.h b/src/main/game/cell.h
new file mode 100644
index 0000000..50a5606
--- /dev/null
+++ b/src/main/game/cell.h
@@ -0,0 +1,32 @@
+/*-
+ * Copyright (C) 2025 Alessandro Iezzi <aiezzi AT alessandroiezzi PERIOD it>
+ *
+ * This file is part of Tris Game.
+ *
+ * Tris Game is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Tris Game is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Tris Game. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GAME_CELL_H__
+#define __GAME_CELL_H__
+
+#include <stdbool.h>
+
+typedef struct Cell {
+ float left, right, top, bottom;
+} Cell;
+
+Cell *cell_new(float left, float right, float top, float bottom);
+bool cell_within_bounds(Cell *cell, float x, float y);
+
+#endif /* __GAME_CELL_H__ */
diff --git a/src/main/game/game.c b/src/main/game/game.c
index 40547cc..5ec3652 100644
--- a/src/main/game/game.c
+++ b/src/main/game/game.c
@@ -21,6 +21,7 @@
#include <stdlib.h>
#include "../engine/engine.h"
#include "game.h"
+#include "cell.h"
#include "../util.h"
#include "../engine/ui/ui.h"
diff --git a/src/main/game/game.h b/src/main/game/game.h
index 0cb80e0..d59df85 100644
--- a/src/main/game/game.h
+++ b/src/main/game/game.h
@@ -22,10 +22,6 @@
#include "../util/list.h"
-typedef struct Cell {
- float left, right, top, bottom;
-} Cell;
-
typedef struct TrisGame {
int width, height;
list_t *cells;