From 69f46d34e9c6a25c63668423fd984d07c1f099a3 Mon Sep 17 00:00:00 2001 From: fschildt Date: Wed, 10 Dec 2025 19:19:32 +0100 Subject: use "" include over <> include for own code --- src/common/Arena.hpp | 3 +-- src/common/Font.cpp | 2 +- src/common/Font.hpp | 1 - src/common/MemoryManager.cpp | 2 +- src/common/MemoryManager.hpp | 3 +-- src/common/defs.hpp | 1 - src/common/math.cpp | 2 +- src/common/math.hpp | 3 --- src/games/Game.cpp | 9 +++++---- src/games/Game.hpp | 2 -- src/games/minesweeper/Minesweeper.cpp | 12 ++---------- src/games/minesweeper/Minesweeper.hpp | 6 +++--- src/games/snake/Snake.cpp | 11 ++++------- src/games/snake/Snake.hpp | 4 ++-- src/games/tetris/Board.cpp | 8 ++++---- src/games/tetris/Board.hpp | 2 +- src/games/tetris/Tetris.cpp | 10 +++++----- src/games/tetris/Tetris.hpp | 9 ++++----- src/games/tetris/Tetromino.cpp | 6 +++--- src/games/tetris/Tetromino.hpp | 5 ++--- src/main.cpp | 5 ++--- src/renderer/RSoftwareBackend.cpp | 2 +- src/renderer/RSoftwareBackend.hpp | 3 ++- src/renderer/Renderer.cpp | 4 ++-- src/renderer/Renderer.hpp | 9 ++++----- 25 files changed, 51 insertions(+), 73 deletions(-) (limited to 'src') diff --git a/src/common/Arena.hpp b/src/common/Arena.hpp index b5e1eb7..0f2273a 100644 --- a/src/common/Arena.hpp +++ b/src/common/Arena.hpp @@ -1,11 +1,10 @@ #pragma once +#include #include #include #include -#include - class Arena { public: diff --git a/src/common/Font.cpp b/src/common/Font.cpp index 8f058ca..e3595e9 100644 --- a/src/common/Font.cpp +++ b/src/common/Font.cpp @@ -1,4 +1,4 @@ -#include +#include "common/Font.hpp" #include #include diff --git a/src/common/Font.hpp b/src/common/Font.hpp index 876b03a..27c2480 100644 --- a/src/common/Font.hpp +++ b/src/common/Font.hpp @@ -1,6 +1,5 @@ #pragma once -#include #include #include diff --git a/src/common/MemoryManager.cpp b/src/common/MemoryManager.cpp index d4fd068..285535b 100644 --- a/src/common/MemoryManager.cpp +++ b/src/common/MemoryManager.cpp @@ -1,4 +1,4 @@ -#include +#include "common/MemoryManager.hpp" std::vector MemoryManager::s_frame_string32s; diff --git a/src/common/MemoryManager.hpp b/src/common/MemoryManager.hpp index 59c31d7..c8c7de0 100644 --- a/src/common/MemoryManager.hpp +++ b/src/common/MemoryManager.hpp @@ -1,9 +1,8 @@ #pragma once -#include - #include #include +#include using String32Id = uint32_t; diff --git a/src/common/defs.hpp b/src/common/defs.hpp index 007d560..8bdfd52 100644 --- a/src/common/defs.hpp +++ b/src/common/defs.hpp @@ -1,7 +1,6 @@ #pragma once #include -#include #define ARRAY_COUNT(x) (sizeof(x) / sizeof(x[0])) diff --git a/src/common/math.cpp b/src/common/math.cpp index ba54f3a..4873301 100644 --- a/src/common/math.cpp +++ b/src/common/math.cpp @@ -1,4 +1,4 @@ -#include +#include "common/math.hpp" /* V2ST */ diff --git a/src/common/math.hpp b/src/common/math.hpp index de856e8..afbda1a 100644 --- a/src/common/math.hpp +++ b/src/common/math.hpp @@ -1,8 +1,5 @@ #pragma once - -#include - #include #include diff --git a/src/games/Game.cpp b/src/games/Game.cpp index 7c63b4f..0f6be9c 100644 --- a/src/games/Game.cpp +++ b/src/games/Game.cpp @@ -1,7 +1,8 @@ -#include -#include -#include -#include +#include "games/Game.hpp" +#include "games/tetris/Tetris.hpp" +#include "games/snake/Snake.hpp" +#include "games/minesweeper/Minesweeper.hpp" +#include "common/defs.hpp" #include #include diff --git a/src/games/Game.hpp b/src/games/Game.hpp index e9eed82..8a44ba9 100644 --- a/src/games/Game.hpp +++ b/src/games/Game.hpp @@ -1,7 +1,5 @@ #pragma once -#include - #include #include diff --git a/src/games/minesweeper/Minesweeper.cpp b/src/games/minesweeper/Minesweeper.cpp index 5cc3215..3638af8 100644 --- a/src/games/minesweeper/Minesweeper.cpp +++ b/src/games/minesweeper/Minesweeper.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "games/minesweeper/Minesweeper.hpp" +#include "renderer/Renderer.hpp" #include @@ -7,14 +7,6 @@ #include -// Todo: -// - First click may not be a mine! -// - Show current time spent -// - Show current flags/mines left -// - Permit uncovering of flagged cell -// - Game Over: Show Highscore for selected difficulty - - static constexpr Color s_mine_count_colors[8] = { {0.0f, 0.0f, 1.0f, 1.0f}, // Blue {0.0f, 0.5f, 0.0f, 1.0f}, // Green diff --git a/src/games/minesweeper/Minesweeper.hpp b/src/games/minesweeper/Minesweeper.hpp index 1db77ff..9088d10 100644 --- a/src/games/minesweeper/Minesweeper.hpp +++ b/src/games/minesweeper/Minesweeper.hpp @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "games/Game.hpp" +#include "common/math.hpp" +#include "common/Font.hpp" class Minesweeper : public Game { diff --git a/src/games/snake/Snake.cpp b/src/games/snake/Snake.cpp index 81de4f0..7dc7f9d 100644 --- a/src/games/snake/Snake.cpp +++ b/src/games/snake/Snake.cpp @@ -1,11 +1,8 @@ -#include -#include -#include - +#include "games/snake/Snake.hpp" +#include "renderer/Renderer.hpp" +#include "common/defs.hpp" -// Todo: -// - gradiant from head to tail -// - reduce thickness from head to tail +#include std::mt19937 Snake::s_rng{std::random_device{}()}; diff --git a/src/games/snake/Snake.hpp b/src/games/snake/Snake.hpp index 103255c..25facd1 100644 --- a/src/games/snake/Snake.hpp +++ b/src/games/snake/Snake.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "games/Game.hpp" +#include "common/math.hpp" #include diff --git a/src/games/tetris/Board.cpp b/src/games/tetris/Board.cpp index a1ab72a..9018e46 100644 --- a/src/games/tetris/Board.cpp +++ b/src/games/tetris/Board.cpp @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include "games/tetris/Board.hpp" +#include "games/tetris/Tetromino.hpp" +#include "games/Game.hpp" +#include "renderer/Renderer.hpp" void Board::Reset() diff --git a/src/games/tetris/Board.hpp b/src/games/tetris/Board.hpp index a91556b..ae6aa0d 100644 --- a/src/games/tetris/Board.hpp +++ b/src/games/tetris/Board.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include class Tetromino; diff --git a/src/games/tetris/Tetris.cpp b/src/games/tetris/Tetris.cpp index 8db772f..8b3c5bd 100644 --- a/src/games/tetris/Tetris.cpp +++ b/src/games/tetris/Tetris.cpp @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include "games/Game.hpp" +#include "games/tetris/Tetromino.hpp" +#include "games/tetris/Tetris.hpp" +#include "renderer/Renderer.hpp" +#include "common/MemoryManager.hpp" #include #include diff --git a/src/games/tetris/Tetris.hpp b/src/games/tetris/Tetris.hpp index 44ed9ff..5864ff7 100644 --- a/src/games/tetris/Tetris.hpp +++ b/src/games/tetris/Tetris.hpp @@ -1,10 +1,9 @@ #pragma once -#include -#include -#include -#include -#include +#include "games/Game.hpp" +#include "games/tetris/Tetromino.hpp" +#include "games/tetris/Board.hpp" +#include "common/Font.hpp" class Tetris : public Game { diff --git a/src/games/tetris/Tetromino.cpp b/src/games/tetris/Tetromino.cpp index ad75161..aa9ed59 100644 --- a/src/games/tetris/Tetromino.cpp +++ b/src/games/tetris/Tetromino.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include "games/tetris/Tetromino.hpp" +#include "games/Game.hpp" +#include "renderer/Renderer.hpp" #include diff --git a/src/games/tetris/Tetromino.hpp b/src/games/tetris/Tetromino.hpp index 86821b9..ca4d788 100644 --- a/src/games/tetris/Tetromino.hpp +++ b/src/games/tetris/Tetromino.hpp @@ -1,8 +1,7 @@ #pragma once -#include -#include -#include +#include "common/math.hpp" +#include "games/tetris/Board.hpp" class Tetromino { diff --git a/src/main.cpp b/src/main.cpp index 44b370b..6fb241e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,7 +1,6 @@ +#include "renderer/Renderer.hpp" +#include "games/Game.hpp" #include "common/MemoryManager.hpp" -#include -#include -#include #include #include diff --git a/src/renderer/RSoftwareBackend.cpp b/src/renderer/RSoftwareBackend.cpp index 927fc92..2606553 100644 --- a/src/renderer/RSoftwareBackend.cpp +++ b/src/renderer/RSoftwareBackend.cpp @@ -1,6 +1,6 @@ #include "common/MemoryManager.hpp" #include "renderer/Renderer.hpp" -#include +#include "renderer/RSoftwareBackend.hpp" #include #include diff --git a/src/renderer/RSoftwareBackend.hpp b/src/renderer/RSoftwareBackend.hpp index 2563558..8e61945 100644 --- a/src/renderer/RSoftwareBackend.hpp +++ b/src/renderer/RSoftwareBackend.hpp @@ -1,7 +1,8 @@ #pragma once +#include "renderer/Renderer.hpp" + #include -#include class RSoftwareBackend { diff --git a/src/renderer/Renderer.cpp b/src/renderer/Renderer.cpp index 17694b0..37d90f3 100644 --- a/src/renderer/Renderer.cpp +++ b/src/renderer/Renderer.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "renderer/Renderer.hpp" +#include "renderer/RSoftwareBackend.hpp" #include #include diff --git a/src/renderer/Renderer.hpp b/src/renderer/Renderer.hpp index 8981826..eaa9630 100644 --- a/src/renderer/Renderer.hpp +++ b/src/renderer/Renderer.hpp @@ -1,10 +1,9 @@ #pragma once -#include -#include -#include -#include -#include +#include "common/math.hpp" +#include "common/Font.hpp" +#include "common/shapes.hpp" +#include "common/MemoryManager.hpp" #include #include -- cgit v1.2.3