From 229ad2dd95e6e5a54187ac57ecbbe63559236e0d Mon Sep 17 00:00:00 2001
From: "Zed A. Shaw" <zed.shaw@gmail.com>
Date: Fri, 27 Feb 2026 13:09:44 -0500
Subject: [PATCH] Textures and palette moved to graphics.

---
 src/game_level.cpp              | 2 +-
 src/{ => graphics}/palette.cpp  | 2 +-
 src/{ => graphics}/palette.hpp  | 0
 src/{ => graphics}/textures.cpp | 2 +-
 src/{ => graphics}/textures.hpp | 0
 src/gui/backend.cpp             | 4 ++--
 src/gui/guecstra.hpp            | 2 +-
 src/gui/map_view.cpp            | 2 +-
 src/gui/map_view.hpp            | 2 +-
 src/gui/mini_map.hpp            | 2 +-
 src/gui/ritual_ui.hpp           | 2 +-
 src/gui/status_ui.hpp           | 2 +-
 src/lights.cpp                  | 2 +-
 src/main.cpp                    | 2 +-
 src/meson.build                 | 4 ++--
 src/raycaster.cpp               | 2 +-
 src/raycaster.hpp               | 2 +-
 src/scene.hpp                   | 2 +-
 src/worldbuilder.cpp            | 2 +-
 tests/animation.cpp             | 2 +-
 tests/battle.cpp                | 2 +-
 tests/map.cpp                   | 2 +-
 tests/matrix.cpp                | 2 +-
 tests/palette.cpp               | 2 +-
 tests/textures.cpp              | 2 +-
 tools/arena.cpp                 | 2 +-
 tools/arena_ui.hpp              | 2 +-
 tools/fragviewer.cpp            | 2 +-
 tools/icongen.cpp               | 4 ++--
 tools/storyboard.cpp            | 2 +-
 30 files changed, 31 insertions(+), 31 deletions(-)
 rename src/{ => graphics}/palette.cpp (98%)
 rename src/{ => graphics}/palette.hpp (100%)
 rename src/{ => graphics}/textures.cpp (99%)
 rename src/{ => graphics}/textures.hpp (100%)

diff --git a/src/game_level.cpp b/src/game_level.cpp
index b4982b1..14747cb 100644
--- a/src/game_level.cpp
+++ b/src/game_level.cpp
@@ -5,7 +5,7 @@
 #include "systems.hpp"
 #include "components.hpp"
 #include "rituals.hpp"
-#include "textures.hpp"
+#include "graphics/textures.hpp"
 #include <list>
 
 using lighting::LightRender;
diff --git a/src/palette.cpp b/src/graphics/palette.cpp
similarity index 98%
rename from src/palette.cpp
rename to src/graphics/palette.cpp
index 3f64142..7151169 100644
--- a/src/palette.cpp
+++ b/src/graphics/palette.cpp
@@ -1,5 +1,5 @@
 #include <fmt/core.h>
-#include "palette.hpp"
+#include "graphics/palette.hpp"
 #include "config.hpp"
 #include "dbc.hpp"
 
diff --git a/src/palette.hpp b/src/graphics/palette.hpp
similarity index 100%
rename from src/palette.hpp
rename to src/graphics/palette.hpp
diff --git a/src/textures.cpp b/src/graphics/textures.cpp
similarity index 99%
rename from src/textures.cpp
rename to src/graphics/textures.cpp
index 225b71d..4185623 100644
--- a/src/textures.cpp
+++ b/src/graphics/textures.cpp
@@ -1,4 +1,4 @@
-#include "textures.hpp"
+#include "graphics/textures.hpp"
 #include <SFML/Graphics/Image.hpp>
 #include "dbc.hpp"
 #include <fmt/core.h>
diff --git a/src/textures.hpp b/src/graphics/textures.hpp
similarity index 100%
rename from src/textures.hpp
rename to src/graphics/textures.hpp
diff --git a/src/gui/backend.cpp b/src/gui/backend.cpp
index d62904e..f185d3b 100644
--- a/src/gui/backend.cpp
+++ b/src/gui/backend.cpp
@@ -1,9 +1,9 @@
 #include "backend.hpp"
 #include "shaders.hpp"
 #include "sound.hpp"
-#include "textures.hpp"
+#include "graphics/textures.hpp"
 #include "config.hpp"
-#include "palette.hpp"
+#include "graphics/palette.hpp"
 
 namespace sfml {
   using namespace nlohmann;
diff --git a/src/gui/guecstra.hpp b/src/gui/guecstra.hpp
index de2ee2a..a7335fc 100644
--- a/src/gui/guecstra.hpp
+++ b/src/gui/guecstra.hpp
@@ -2,7 +2,7 @@
 #include "components.hpp"
 #include "events.hpp"
 #include <guecs/ui.hpp>
-#include "textures.hpp"
+#include "graphics/textures.hpp"
 
 namespace guecs {
   Clickable make_action(guecs::Entity gui_id, game::Event event);
diff --git a/src/gui/map_view.cpp b/src/gui/map_view.cpp
index eb7c24e..f85d6f4 100644
--- a/src/gui/map_view.cpp
+++ b/src/gui/map_view.cpp
@@ -10,7 +10,7 @@
 #include <iostream>
 #include <fmt/xchar.h>
 #include <fstream>
-#include "palette.hpp"
+#include "graphics/palette.hpp"
 #include "game_level.hpp"
 
 constexpr const int MAP_WIDTH=13;
diff --git a/src/gui/map_view.hpp b/src/gui/map_view.hpp
index 5a71ebe..92abe2e 100644
--- a/src/gui/map_view.hpp
+++ b/src/gui/map_view.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "textures.hpp"
+#include "graphics/textures.hpp"
 #include "algos/matrix.hpp"
 #include <guecs/ui.hpp>
 #include <string>
diff --git a/src/gui/mini_map.hpp b/src/gui/mini_map.hpp
index b26cfcf..4a74911 100644
--- a/src/gui/mini_map.hpp
+++ b/src/gui/mini_map.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "textures.hpp"
+#include "graphics/textures.hpp"
 #include <guecs/ui.hpp>
 #include <memory>
 
diff --git a/src/gui/ritual_ui.hpp b/src/gui/ritual_ui.hpp
index 075c8fa..ee46cf1 100644
--- a/src/gui/ritual_ui.hpp
+++ b/src/gui/ritual_ui.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "constants.hpp"
 #include <deque>
-#include "textures.hpp"
+#include "graphics/textures.hpp"
 #include <guecs/ui.hpp>
 #include "rituals.hpp"
 #include "simplefsm.hpp"
diff --git a/src/gui/status_ui.hpp b/src/gui/status_ui.hpp
index 221aa8a..1908531 100644
--- a/src/gui/status_ui.hpp
+++ b/src/gui/status_ui.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "constants.hpp"
 #include <deque>
-#include "textures.hpp"
+#include "graphics/textures.hpp"
 #include <guecs/ui.hpp>
 #include "gui/ritual_ui.hpp"
 #include "gui/guecstra.hpp"
diff --git a/src/lights.cpp b/src/lights.cpp
index ac797fa..2702cfa 100644
--- a/src/lights.cpp
+++ b/src/lights.cpp
@@ -1,6 +1,6 @@
 #include "lights.hpp"
 #include "constants.hpp"
-#include "textures.hpp"
+#include "graphics/textures.hpp"
 #include <vector>
 
 using std::vector;
diff --git a/src/main.cpp b/src/main.cpp
index 6fb49ad..bfe8899 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,5 +1,5 @@
 #include "gui/fsm.hpp"
-#include "textures.hpp"
+#include "graphics/textures.hpp"
 #include "sound.hpp"
 #include "autowalker.hpp"
 #include "ai/ai.hpp"
diff --git a/src/meson.build b/src/meson.build
index 9e3faf8..b9fe4ef 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -33,8 +33,8 @@ sources = files(
   'storyboard/ui.cpp',
 
   # graphics
-  'textures.cpp',
-  'palette.cpp',
+  'graphics/textures.cpp',
+  'graphics/palette.cpp',
   'shaders.cpp',
   'scene.cpp',
   'animation.cpp',
diff --git a/src/raycaster.cpp b/src/raycaster.cpp
index 8511af2..cd66f2c 100644
--- a/src/raycaster.cpp
+++ b/src/raycaster.cpp
@@ -8,7 +8,7 @@
 #include <memory>
 #include <numbers>
 #include "components.hpp"
-#include "textures.hpp"
+#include "graphics/textures.hpp"
 #include "systems.hpp"
 #include "shaders.hpp"
 #include "animation.hpp"
diff --git a/src/raycaster.hpp b/src/raycaster.hpp
index 9cc06fb..f0245f4 100644
--- a/src/raycaster.hpp
+++ b/src/raycaster.hpp
@@ -4,7 +4,7 @@
 #include <SFML/System/Clock.hpp>
 #include "algos/spatialmap.hpp"
 #include "game_level.hpp"
-#include "textures.hpp"
+#include "graphics/textures.hpp"
 
 using matrix::Matrix;
 using RGBA = uint32_t;
diff --git a/src/scene.hpp b/src/scene.hpp
index 023d911..854f0c4 100644
--- a/src/scene.hpp
+++ b/src/scene.hpp
@@ -2,7 +2,7 @@
 
 #include <memory>
 #include <unordered_map>
-#include "textures.hpp"
+#include "graphics/textures.hpp"
 #include <SFML/Graphics/RenderWindow.hpp>
 #include <guecs/ui.hpp>
 #include "camera.hpp"
diff --git a/src/worldbuilder.cpp b/src/worldbuilder.cpp
index e4f1a80..184cba0 100644
--- a/src/worldbuilder.cpp
+++ b/src/worldbuilder.cpp
@@ -5,7 +5,7 @@
 #include "components.hpp"
 #include "rituals.hpp"
 #include "algos/maze.hpp"
-#include "textures.hpp"
+#include "graphics/textures.hpp"
 #include "inventory.hpp"
 #include "systems.hpp"
 #include "animation.hpp"
diff --git a/tests/animation.cpp b/tests/animation.cpp
index 8565f07..08b619e 100644
--- a/tests/animation.cpp
+++ b/tests/animation.cpp
@@ -1,5 +1,5 @@
 #include <catch2/catch_test_macros.hpp>
-#include "textures.hpp"
+#include "graphics/textures.hpp"
 #include "dinkyecs.hpp"
 #include "config.hpp"
 #include <iostream>
diff --git a/tests/battle.cpp b/tests/battle.cpp
index 3f9d34a..ef5d8e2 100644
--- a/tests/battle.cpp
+++ b/tests/battle.cpp
@@ -10,7 +10,7 @@
 #include "game_level.hpp"
 #include "components.hpp"
 #include "ai/ai.hpp"
-#include "palette.hpp"
+#include "graphics/palette.hpp"
 
 using namespace combat;
 using namespace boss;
diff --git a/tests/map.cpp b/tests/map.cpp
index b3364b9..314f658 100644
--- a/tests/map.cpp
+++ b/tests/map.cpp
@@ -6,7 +6,7 @@
 #include "game_level.hpp"
 #include "systems.hpp"
 #include <cmath>
-#include "textures.hpp"
+#include "graphics/textures.hpp"
 
 using namespace fmt;
 using namespace nlohmann;
diff --git a/tests/matrix.cpp b/tests/matrix.cpp
index 88b36b8..0be82a0 100644
--- a/tests/matrix.cpp
+++ b/tests/matrix.cpp
@@ -9,7 +9,7 @@
 #include <fstream>
 #include "map.hpp"
 #include <memory>
-#include "textures.hpp"
+#include "graphics/textures.hpp"
 
 using namespace nlohmann;
 using namespace fmt;
diff --git a/tests/palette.cpp b/tests/palette.cpp
index 9a28624..a96ad81 100644
--- a/tests/palette.cpp
+++ b/tests/palette.cpp
@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 #include <fmt/core.h>
 #include <string>
-#include "palette.hpp"
+#include "graphics/palette.hpp"
 
 using namespace fmt;
 
diff --git a/tests/textures.cpp b/tests/textures.cpp
index 99de020..cb38292 100644
--- a/tests/textures.cpp
+++ b/tests/textures.cpp
@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 #include <fmt/core.h>
 #include <string>
-#include "textures.hpp"
+#include "graphics/textures.hpp"
 #include "constants.hpp"
 #include "components.hpp"
 
diff --git a/tools/arena.cpp b/tools/arena.cpp
index b1af8de..0bfc2a2 100644
--- a/tools/arena.cpp
+++ b/tools/arena.cpp
@@ -1,4 +1,4 @@
-#include "textures.hpp"
+#include "graphics/textures.hpp"
 #include "sound.hpp"
 #include "autowalker.hpp"
 #include "ai/ai.hpp"
diff --git a/tools/arena_ui.hpp b/tools/arena_ui.hpp
index fabd241..ab46cbe 100644
--- a/tools/arena_ui.hpp
+++ b/tools/arena_ui.hpp
@@ -2,7 +2,7 @@
 #include <SFML/Graphics/RenderWindow.hpp>
 #include <SFML/Graphics/Font.hpp>
 #include "guecs.hpp"
-#include "textures.hpp"
+#include "graphics/textures.hpp"
 #include "components.hpp"
 #include <SFML/System/Clock.hpp>
 
diff --git a/tools/fragviewer.cpp b/tools/fragviewer.cpp
index b08ca5f..95330b9 100644
--- a/tools/fragviewer.cpp
+++ b/tools/fragviewer.cpp
@@ -1,4 +1,4 @@
-#include "textures.hpp"
+#include "graphics/textures.hpp"
 #include <SFML/Graphics.hpp>
 #include <SFML/System.hpp>
 #include <SFML/Audio.hpp>
diff --git a/tools/icongen.cpp b/tools/icongen.cpp
index f83a44c..c4161cb 100644
--- a/tools/icongen.cpp
+++ b/tools/icongen.cpp
@@ -8,8 +8,8 @@
 #include "shiterator.hpp"
 #include <functional>
 #include <iostream>
-#include "textures.hpp"
-#include "palette.hpp"
+#include "graphics/textures.hpp"
+#include "graphics/palette.hpp"
 
 namespace fs = std::filesystem;
 constexpr const int TILE_COUNT=10;
diff --git a/tools/storyboard.cpp b/tools/storyboard.cpp
index 1aa5711..96bed33 100644
--- a/tools/storyboard.cpp
+++ b/tools/storyboard.cpp
@@ -1,5 +1,5 @@
 #include "gui/fsm.hpp"
-#include "textures.hpp"
+#include "graphics/textures.hpp"
 #include "sound.hpp"
 #include <iostream>
 #include "shaders.hpp"