Textures and palette moved to graphics.

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;

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"
 

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>

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;

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);

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;

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>

src/gui/mini_map.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "textures.hpp"
+#include "graphics/textures.hpp"
 #include <guecs/ui.hpp>
 #include <memory>
 

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"

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"

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;

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"

src/meson.build

@@ -33,8 +33,8 @@ sources = files(
   'storyboard/ui.cpp',
 
   # graphics
-  'textures.cpp',
+  'graphics/textures.cpp',
-  'palette.cpp',
+  'graphics/palette.cpp',
   'shaders.cpp',
   'scene.cpp',
   'animation.cpp',

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"

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;

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"

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"

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>

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;

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;

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;

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;
 

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"
 

tools/arena.cpp

@@ -1,4 +1,4 @@
-#include "textures.hpp"
+#include "graphics/textures.hpp"
 #include "sound.hpp"
 #include "autowalker.hpp"
 #include "ai/ai.hpp"

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>
 

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>

tools/icongen.cpp

@@ -8,8 +8,8 @@
 #include "shiterator.hpp"
 #include <functional>
 #include <iostream>
-#include "textures.hpp"
+#include "graphics/textures.hpp"
-#include "palette.hpp"
+#include "graphics/palette.hpp"
 
 namespace fs = std::filesystem;
 constexpr const int TILE_COUNT=10;

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"