Algos directory is setup.

src/ai/goap.cpp

@@ -1,7 +1,7 @@
 #include "dbc.hpp"
 #include "goap.hpp"
 #include "ai_debug.hpp"
-#include "stats.hpp"
+#include "algos/stats.hpp"
 #include <queue>
 
 // #define DEBUG_CYCLES 1

src/algos/maze.cpp

@@ -1,8 +1,8 @@
 #include <fmt/core.h>
 #include <string>
-#include "rand.hpp"
+#include "algos/rand.hpp"
 #include "constants.hpp"
-#include "maze.hpp"
+#include "algos/maze.hpp"
 
 using std::string;
 using matrix::Matrix;

src/algos/pathing.cpp

@@ -1,5 +1,5 @@
 #include "constants.hpp"
-#include "pathing.hpp"
+#include "algos/pathing.hpp"
 #include "dbc.hpp"
 #include <vector>
 

src/algos/rand.cpp

@@ -1,4 +1,4 @@
-#include "rand.hpp"
+#include "algos/rand.hpp"
 
 namespace Random {
   std::random_device RNG;

src/algos/spatialmap.cpp

@@ -1,4 +1,4 @@
-#include "spatialmap.hpp"
+#include "algos/spatialmap.hpp"
 #include <fmt/core.h>
 
 using namespace fmt;

src/algos/stats.cpp

@@ -1,4 +1,4 @@
-#include "stats.hpp"
+#include "algos/stats.hpp"
 #include <fmt/core.h>
 #include "dbc.hpp"
 

src/animation.cpp

@@ -2,7 +2,7 @@
 #include <memory>
 #include <chrono>
 #include "dbc.hpp"
-#include "rand.hpp"
+#include "algos/rand.hpp"
 #include <iostream>
 #include <fstream>
 #include "sound.hpp"

src/boss/fight.cpp

@@ -3,7 +3,7 @@
 #include "boss/system.hpp"
 #include "game_level.hpp"
 #include <iostream>
-#include "rand.hpp"
+#include "algos/rand.hpp"
 #include "events.hpp"
 
 namespace boss {

src/combat/combat.cpp

@@ -1,5 +1,5 @@
 #include "components.hpp"
-#include "rand.hpp"
+#include "algos/rand.hpp"
 
 namespace components {
   int Combat::attack(Combat &target) {

src/easing.cpp

@@ -1,4 +1,4 @@
-#include "rand.hpp"
+#include "algos/rand.hpp"
 #include "animation.hpp"
 #include <fmt/core.h>
 #include <unordered_map>

src/game_level.hpp

@@ -5,7 +5,7 @@
 #include "lights.hpp"
 #include "map.hpp"
 #include <memory>
-#include "spatialmap.hpp"
+#include "algos/spatialmap.hpp"
 
 namespace components {
   struct Position;

src/gui/debug_ui.hpp

@@ -3,7 +3,7 @@
 #include <SFML/Graphics/RenderWindow.hpp>
 #include <SFML/Graphics/Font.hpp>
 #include <guecs/ui.hpp>
-#include "stats.hpp"
+#include "algos/stats.hpp"
 
 namespace gui {
   class DebugUI {

src/gui/main_ui.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #include <SFML/Graphics/RenderWindow.hpp>
 #include <SFML/System/Clock.hpp>
-#include "stats.hpp"
+#include "algos/stats.hpp"
 #include <guecs/ui.hpp>
 #include "gui/overlay_ui.hpp"
 #include "gui/debug_ui.hpp"

src/gui/map_view.cpp

@@ -3,9 +3,9 @@
 #include <string>
 #include "dbc.hpp"
 #include "components.hpp"
-#include "rand.hpp"
+#include "algos/rand.hpp"
 #include "systems.hpp"
-#include "rand.hpp"
+#include "algos/rand.hpp"
 #include <codecvt>
 #include <iostream>
 #include <fmt/xchar.h>

src/gui/mini_map.cpp

@@ -3,9 +3,9 @@
 #include <string>
 #include "dbc.hpp"
 #include "components.hpp"
-#include "rand.hpp"
+#include "algos/rand.hpp"
 #include "systems.hpp"
-#include "rand.hpp"
+#include "algos/rand.hpp"
 #include <codecvt>
 #include <iostream>
 #include <memory>

src/gui/ritual_ui.cpp

@@ -1,6 +1,6 @@
 #include "gui/ritual_ui.hpp"
 #include <guecs/ui.hpp>
-#include "rand.hpp"
+#include "algos/rand.hpp"
 #include "sound.hpp"
 #include "events.hpp"
 #include "game_level.hpp"

src/gui/status_ui.cpp

@@ -1,7 +1,7 @@
 #include "gui/status_ui.hpp"
 #include "components.hpp"
 #include <guecs/ui.hpp>
-#include "rand.hpp"
+#include "algos/rand.hpp"
 #include <fmt/xchar.h>
 #include "gui/guecstra.hpp"
 #include "systems.hpp"

src/lights.hpp

@@ -4,7 +4,7 @@
 #include "point.hpp"
 #include <algorithm>
 #include "algos/matrix.hpp"
-#include "pathing.hpp"
+#include "algos/pathing.hpp"
 #include "components.hpp"
 
 namespace lighting {

src/map.cpp

@@ -1,12 +1,11 @@
 #include "map.hpp"
 #include "dbc.hpp"
-#include "rand.hpp"
+#include "algos/rand.hpp"
 #include <vector>
 #include <array>
 #include <fmt/core.h>
 #include <utility>
 #include "algos/matrix.hpp"
-#include "rand.hpp"
 
 using std::vector, std::pair;
 using namespace fmt;

src/map.hpp

@@ -7,7 +7,7 @@
 #include <fmt/core.h>
 #include "point.hpp"
 #include "lights.hpp"
-#include "pathing.hpp"
+#include "algos/pathing.hpp"
 #include "algos/matrix.hpp"
 #include "constants.hpp"
 

src/meson.build

@@ -45,11 +45,11 @@ sources = files(
 
   # algos
   'algos/matrix.cpp',
-  'maze.cpp',
+  'algos/maze.cpp',
-  'pathing.cpp',
+  'algos/pathing.cpp',
-  'rand.cpp',
+  'algos/rand.cpp',
-  'spatialmap.cpp',
+  'algos/spatialmap.cpp',
-  'stats.cpp',
+  'algos/stats.cpp',
 
   # game
   'systems.cpp',

src/raycaster.hpp

@@ -2,7 +2,7 @@
 
 #include <SFML/Graphics.hpp>
 #include <SFML/System/Clock.hpp>
-#include "spatialmap.hpp"
+#include "algos/spatialmap.hpp"
 #include "game_level.hpp"
 #include "textures.hpp"
 

src/shiterator.hpp

@@ -7,7 +7,7 @@
 #include <algorithm>
 #include <fmt/core.h>
 #include "point.hpp"
-#include "rand.hpp"
+#include "algos/rand.hpp"
 #include "dbc.hpp"
 
 /*

src/systems.cpp

@@ -2,8 +2,8 @@
 #include <fmt/core.h>
 #include <string>
 #include <cmath>
-#include "rand.hpp"
+#include "algos/rand.hpp"
-#include "spatialmap.hpp"
+#include "algos/spatialmap.hpp"
 #include "dbc.hpp"
 #include "lights.hpp"
 #include "events.hpp"

src/systems.hpp

@@ -2,7 +2,7 @@
 #include "components.hpp"
 #include <SFML/Graphics/RenderTexture.hpp>
 #include "map.hpp"
-#include "spatialmap.hpp"
+#include "algos/spatialmap.hpp"
 #include "game_level.hpp"
 
 namespace System {

src/worldbuilder.cpp

@@ -1,10 +1,10 @@
 #include "worldbuilder.hpp"
-#include "rand.hpp"
+#include "algos/rand.hpp"
 #include <fmt/core.h>
 #include <iostream>
 #include "components.hpp"
 #include "rituals.hpp"
-#include "maze.hpp"
+#include "algos/maze.hpp"
 #include "textures.hpp"
 #include "inventory.hpp"
 #include "systems.hpp"

src/worldbuilder.hpp

@@ -3,7 +3,7 @@
 #include "map.hpp"
 #include "dinkyecs.hpp"
 #include "components.hpp"
-#include "spatialmap.hpp"
+#include "algos/spatialmap.hpp"
 
 class WorldBuilder {
   public:

tests/animation.cpp

@@ -6,7 +6,7 @@
 #include <memory>
 #include <chrono>
 #include <thread>
-#include "rand.hpp"
+#include "algos/rand.hpp"
 #include "animation.hpp"
 #include "sound.hpp"
 #include "components.hpp"

tests/matrix.cpp

@@ -3,7 +3,7 @@
 #include <string>
 #include "config.hpp"
 #include "algos/matrix.hpp"
-#include "rand.hpp"
+#include "algos/rand.hpp"
 #include "game_level.hpp"
 #include <nlohmann/json.hpp>
 #include <fstream>

tests/mazes.cpp

@@ -2,9 +2,9 @@
 #include <fmt/core.h>
 #include <string>
 #include "algos/matrix.hpp"
-#include "rand.hpp"
+#include "algos/rand.hpp"
 #include "constants.hpp"
-#include "maze.hpp"
+#include "algos/maze.hpp"
 
 using std::string;
 using matrix::Matrix;

tests/pathing.cpp

@@ -2,13 +2,13 @@
 #include <fmt/core.h>
 #include <nlohmann/json.hpp>
 #include <fstream>
-#include "pathing.hpp"
+#include "algos/pathing.hpp"
 #include "algos/matrix.hpp"
 #include "ai/ai.hpp"
 #include "game_level.hpp"
 #include <chrono>
 #include <thread>
-#include "rand.hpp"
+#include "algos/rand.hpp"
 #include "systems.hpp"
 
 using namespace fmt;

tests/spatialmap.cpp

@@ -1,9 +1,9 @@
 #include <catch2/catch_test_macros.hpp>
 #include <fmt/core.h>
 #include <string>
-#include "spatialmap.hpp"
+#include "algos/spatialmap.hpp"
 #include "dinkyecs.hpp"
-#include "rand.hpp"
+#include "algos/rand.hpp"
 #include <limits>
 #include <fmt/core.h>
 

tests/stats.cpp

@@ -1,6 +1,6 @@
 #include <catch2/catch_test_macros.hpp>
-#include "stats.hpp"
+#include "algos/stats.hpp"
-#include "rand.hpp"
+#include "algos/rand.hpp"
 #include <cmath>
 #include <fmt/core.h>