animation and lights moved to graphics

src/boss/ui.cpp

@@ -1,5 +1,5 @@
 #include "boss/ui.hpp"
-#include "scene.hpp"
+#include "graphics/scene.hpp"
 #include "constants.hpp"
 #include "components.hpp"
 #include <fmt/xchar.h>

src/boss/ui.hpp

@@ -2,7 +2,7 @@
 #include <memory>
 #include <guecs/ui.hpp>
 #include "gui/combat_ui.hpp"
-#include "scene.hpp"
+#include "graphics/scene.hpp"
 
 namespace components {
   struct Animation;

src/camera.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "animation.hpp"
+#include "graphics/animation.hpp"
 #include "constants.hpp"
 #include <SFML/Graphics/RenderTexture.hpp>
 

src/easing.cpp

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

src/easing.hpp

@@ -1,5 +1,5 @@
 #include <functional>
-#include "animation.hpp"
+#include "graphics/animation.hpp"
 
 namespace animation {
   struct Transform;

src/game_level.hpp

@@ -2,7 +2,7 @@
 
 #include "dinkyecs.hpp"
 #include "boss/ui.hpp"
-#include "lights.hpp"
+#include "graphics/lights.hpp"
 #include "map.hpp"
 #include <memory>
 #include "algos/spatialmap.hpp"

src/graphics/animation.cpp

@@ -1,4 +1,4 @@
-#include "animation.hpp"
+#include "graphics/animation.hpp"
 #include <memory>
 #include <chrono>
 #include "dbc.hpp"

src/graphics/lights.cpp

@@ -1,4 +1,4 @@
-#include "lights.hpp"
+#include "graphics/lights.hpp"
 #include "constants.hpp"
 #include "graphics/textures.hpp"
 #include <vector>

src/graphics/scene.cpp

@@ -1,6 +1,6 @@
-#include "scene.hpp"
+#include "graphics/scene.hpp"
-#include "animation.hpp"
+#include "graphics/animation.hpp"
-#include "shaders.hpp"
+#include "graphics/shaders.hpp"
 #include <fmt/core.h>
 #include "dbc.hpp"
 

src/graphics/scene.hpp

@@ -7,7 +7,7 @@
 #include <guecs/ui.hpp>
 #include "camera.hpp"
 #include <functional>
-#include "animation.hpp"
+#include "graphics/animation.hpp"
 #include "components.hpp"
 
 namespace scene {

src/graphics/shaders.cpp

@@ -1,4 +1,4 @@
-#include "shaders.hpp"
+#include "graphics/shaders.hpp"
 #include <SFML/Graphics/Image.hpp>
 #include "dbc.hpp"
 #include <fmt/core.h>

src/gui/backend.cpp

@@ -1,5 +1,5 @@
 #include "backend.hpp"
-#include "shaders.hpp"
+#include "graphics/shaders.hpp"
 #include "sound.hpp"
 #include "graphics/textures.hpp"
 #include "config.hpp"

src/gui/fsm.cpp

@@ -8,7 +8,7 @@
 #include "systems.hpp"
 #include "events.hpp"
 #include "sound.hpp"
-#include "shaders.hpp"
+#include "graphics/shaders.hpp"
 #include <fmt/xchar.h>
 #include "gui/guecstra.hpp"
 #include "game_level.hpp"

src/gui/main_ui.cpp

@@ -1,7 +1,7 @@
 #include "gui/main_ui.hpp"
 #include "components.hpp"
 #include <fmt/xchar.h>
-#include "animation.hpp"
+#include "graphics/animation.hpp"
 #include "constants.hpp"
 #include "game_level.hpp"
 #include "ai/ai.hpp"

src/gui/ritual_ui.hpp

@@ -5,7 +5,7 @@
 #include <guecs/ui.hpp>
 #include "rituals.hpp"
 #include "simplefsm.hpp"
-#include "animation.hpp"
+#include "graphics/animation.hpp"
 
 namespace gui {
   namespace ritual {

src/main.cpp

@@ -4,7 +4,7 @@
 #include "autowalker.hpp"
 #include "ai/ai.hpp"
 #include <iostream>
-#include "shaders.hpp"
+#include "graphics/shaders.hpp"
 #include "gui/backend.hpp"
 #include "game_level.hpp"
 #include "camera.hpp"

src/map.hpp

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

src/meson.build

@@ -35,10 +35,10 @@ sources = files(
   # graphics
   'graphics/textures.cpp',
   'graphics/palette.cpp',
-  'shaders.cpp',
+  'graphics/shaders.cpp',
-  'scene.cpp',
+  'graphics/scene.cpp',
-  'animation.cpp',
+  'graphics/animation.cpp',
-  'lights.cpp',
+  'graphics/lights.cpp',
   'raycaster.cpp',
   'easing.cpp',
   'camera.cpp',

src/raycaster.cpp

@@ -10,8 +10,8 @@
 #include "components.hpp"
 #include "graphics/textures.hpp"
 #include "systems.hpp"
-#include "shaders.hpp"
+#include "graphics/shaders.hpp"
-#include "animation.hpp"
+#include "graphics/animation.hpp"
 
 using namespace fmt;
 using std::make_unique, std::shared_ptr;

src/systems.cpp

@@ -5,7 +5,7 @@
 #include "algos/rand.hpp"
 #include "algos/spatialmap.hpp"
 #include "dbc.hpp"
-#include "lights.hpp"
+#include "graphics/lights.hpp"
 #include "events.hpp"
 #include "sound.hpp"
 #include "ai/ai.hpp"
@@ -14,11 +14,11 @@
 #include "rituals.hpp"
 #include "combat/battle.hpp"
 #include <iostream>
-#include "shaders.hpp"
+#include "graphics/shaders.hpp"
 #include "inventory.hpp"
 #include "game_level.hpp"
 #include "events.hpp"
-#include "animation.hpp"
+#include "graphics/animation.hpp"
 
 using std::string;
 using namespace fmt;

src/worldbuilder.cpp

@@ -8,7 +8,7 @@
 #include "graphics/textures.hpp"
 #include "inventory.hpp"
 #include "systems.hpp"
-#include "animation.hpp"
+#include "graphics/animation.hpp"
 
 using namespace fmt;
 using namespace components;

tests/animation.cpp

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

tests/lighting.cpp

@@ -4,7 +4,7 @@
 #include <fstream>
 #include "map.hpp"
 #include "game_level.hpp"
-#include "lights.hpp"
+#include "graphics/lights.hpp"
 #include "point.hpp"
 
 using namespace lighting;

tests/shaders.cpp

@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 #include <fmt/core.h>
 #include <string>
-#include "shaders.hpp"
+#include "graphics/shaders.hpp"
 
 using namespace fmt;
 

tools/animator.cpp

@@ -2,10 +2,10 @@
 #include "sound.hpp"
 #include "ai/ai.hpp"
 #include <iostream>
-#include "shaders.hpp"
+#include "graphics/shaders.hpp"
 #include "gui/backend.hpp"
 #include "constants.hpp"
-#include "animation.hpp"
+#include "graphics/animation.hpp"
 #include "tools/animator.hpp"
 #include <unistd.h>
 #include <ranges>

tools/arena.cpp

@@ -3,7 +3,7 @@
 #include "autowalker.hpp"
 #include "ai/ai.hpp"
 #include <iostream>
-#include "shaders.hpp"
+#include "graphics/shaders.hpp"
 #include "gui/backend.hpp"
 #include "game_level.hpp"
 #include "boss/system.hpp"

tools/storyboard.cpp

@@ -2,7 +2,7 @@
 #include "graphics/textures.hpp"
 #include "sound.hpp"
 #include <iostream>
-#include "shaders.hpp"
+#include "graphics/shaders.hpp"
 #include "constants.hpp"
 #include "gui/backend.hpp"
 #include "gui/event_router.hpp"