From 86a9f815c1373791f69fa7b17f65162047ba201b Mon Sep 17 00:00:00 2001 From: "Zed A. Shaw" Date: Fri, 27 Feb 2026 13:57:44 -0500 Subject: [PATCH] animation and lights moved to graphics --- src/boss/ui.cpp | 2 +- src/boss/ui.hpp | 2 +- src/camera.hpp | 2 +- src/easing.cpp | 2 +- src/easing.hpp | 2 +- src/game_level.hpp | 2 +- src/{ => graphics}/animation.cpp | 2 +- src/{ => graphics}/animation.hpp | 0 src/{ => graphics}/lights.cpp | 2 +- src/{ => graphics}/lights.hpp | 0 src/{ => graphics}/scene.cpp | 6 +++--- src/{ => graphics}/scene.hpp | 2 +- src/{ => graphics}/shaders.cpp | 2 +- src/{ => graphics}/shaders.hpp | 0 src/gui/backend.cpp | 2 +- src/gui/fsm.cpp | 2 +- src/gui/main_ui.cpp | 2 +- src/gui/ritual_ui.hpp | 2 +- src/main.cpp | 2 +- src/map.hpp | 2 +- src/meson.build | 8 ++++---- src/raycaster.cpp | 4 ++-- src/systems.cpp | 6 +++--- src/worldbuilder.cpp | 2 +- tests/animation.cpp | 2 +- tests/lighting.cpp | 2 +- tests/shaders.cpp | 2 +- tools/animator.cpp | 4 ++-- tools/arena.cpp | 2 +- tools/storyboard.cpp | 2 +- 30 files changed, 36 insertions(+), 36 deletions(-) rename src/{ => graphics}/animation.cpp (99%) rename src/{ => graphics}/animation.hpp (100%) rename src/{ => graphics}/lights.cpp (98%) rename src/{ => graphics}/lights.hpp (100%) rename src/{ => graphics}/scene.cpp (98%) rename src/{ => graphics}/scene.hpp (98%) rename src/{ => graphics}/shaders.cpp (98%) rename src/{ => graphics}/shaders.hpp (100%) diff --git a/src/boss/ui.cpp b/src/boss/ui.cpp index 65b34a4..1ad9da0 100644 --- a/src/boss/ui.cpp +++ b/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 diff --git a/src/boss/ui.hpp b/src/boss/ui.hpp index b5997e5..1ef4789 100644 --- a/src/boss/ui.hpp +++ b/src/boss/ui.hpp @@ -2,7 +2,7 @@ #include #include #include "gui/combat_ui.hpp" -#include "scene.hpp" +#include "graphics/scene.hpp" namespace components { struct Animation; diff --git a/src/camera.hpp b/src/camera.hpp index b6543ec..b16090e 100644 --- a/src/camera.hpp +++ b/src/camera.hpp @@ -1,5 +1,5 @@ #pragma once -#include "animation.hpp" +#include "graphics/animation.hpp" #include "constants.hpp" #include diff --git a/src/easing.cpp b/src/easing.cpp index d639e44..64b4a00 100644 --- a/src/easing.cpp +++ b/src/easing.cpp @@ -1,5 +1,5 @@ #include "algos/rand.hpp" -#include "animation.hpp" +#include "graphics/animation.hpp" #include #include #include "dbc.hpp" diff --git a/src/easing.hpp b/src/easing.hpp index 20544f4..14ffb3f 100644 --- a/src/easing.hpp +++ b/src/easing.hpp @@ -1,5 +1,5 @@ #include -#include "animation.hpp" +#include "graphics/animation.hpp" namespace animation { struct Transform; diff --git a/src/game_level.hpp b/src/game_level.hpp index 4617eb3..52c96c7 100644 --- a/src/game_level.hpp +++ b/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 #include "algos/spatialmap.hpp" diff --git a/src/animation.cpp b/src/graphics/animation.cpp similarity index 99% rename from src/animation.cpp rename to src/graphics/animation.cpp index 30c8381..38ec989 100644 --- a/src/animation.cpp +++ b/src/graphics/animation.cpp @@ -1,4 +1,4 @@ -#include "animation.hpp" +#include "graphics/animation.hpp" #include #include #include "dbc.hpp" diff --git a/src/animation.hpp b/src/graphics/animation.hpp similarity index 100% rename from src/animation.hpp rename to src/graphics/animation.hpp diff --git a/src/lights.cpp b/src/graphics/lights.cpp similarity index 98% rename from src/lights.cpp rename to src/graphics/lights.cpp index 2702cfa..2b0d76a 100644 --- a/src/lights.cpp +++ b/src/graphics/lights.cpp @@ -1,4 +1,4 @@ -#include "lights.hpp" +#include "graphics/lights.hpp" #include "constants.hpp" #include "graphics/textures.hpp" #include diff --git a/src/lights.hpp b/src/graphics/lights.hpp similarity index 100% rename from src/lights.hpp rename to src/graphics/lights.hpp diff --git a/src/scene.cpp b/src/graphics/scene.cpp similarity index 98% rename from src/scene.cpp rename to src/graphics/scene.cpp index 6b5d61d..8ff6585 100644 --- a/src/scene.cpp +++ b/src/graphics/scene.cpp @@ -1,6 +1,6 @@ -#include "scene.hpp" -#include "animation.hpp" -#include "shaders.hpp" +#include "graphics/scene.hpp" +#include "graphics/animation.hpp" +#include "graphics/shaders.hpp" #include #include "dbc.hpp" diff --git a/src/scene.hpp b/src/graphics/scene.hpp similarity index 98% rename from src/scene.hpp rename to src/graphics/scene.hpp index 854f0c4..c4d582c 100644 --- a/src/scene.hpp +++ b/src/graphics/scene.hpp @@ -7,7 +7,7 @@ #include #include "camera.hpp" #include -#include "animation.hpp" +#include "graphics/animation.hpp" #include "components.hpp" namespace scene { diff --git a/src/shaders.cpp b/src/graphics/shaders.cpp similarity index 98% rename from src/shaders.cpp rename to src/graphics/shaders.cpp index be86529..5a7c954 100644 --- a/src/shaders.cpp +++ b/src/graphics/shaders.cpp @@ -1,4 +1,4 @@ -#include "shaders.hpp" +#include "graphics/shaders.hpp" #include #include "dbc.hpp" #include diff --git a/src/shaders.hpp b/src/graphics/shaders.hpp similarity index 100% rename from src/shaders.hpp rename to src/graphics/shaders.hpp diff --git a/src/gui/backend.cpp b/src/gui/backend.cpp index f185d3b..ce5a7a6 100644 --- a/src/gui/backend.cpp +++ b/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" diff --git a/src/gui/fsm.cpp b/src/gui/fsm.cpp index 2f2a617..5bd3857 100644 --- a/src/gui/fsm.cpp +++ b/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 #include "gui/guecstra.hpp" #include "game_level.hpp" diff --git a/src/gui/main_ui.cpp b/src/gui/main_ui.cpp index 25529df..0eef6b9 100644 --- a/src/gui/main_ui.cpp +++ b/src/gui/main_ui.cpp @@ -1,7 +1,7 @@ #include "gui/main_ui.hpp" #include "components.hpp" #include -#include "animation.hpp" +#include "graphics/animation.hpp" #include "constants.hpp" #include "game_level.hpp" #include "ai/ai.hpp" diff --git a/src/gui/ritual_ui.hpp b/src/gui/ritual_ui.hpp index ee46cf1..d2e998b 100644 --- a/src/gui/ritual_ui.hpp +++ b/src/gui/ritual_ui.hpp @@ -5,7 +5,7 @@ #include #include "rituals.hpp" #include "simplefsm.hpp" -#include "animation.hpp" +#include "graphics/animation.hpp" namespace gui { namespace ritual { diff --git a/src/main.cpp b/src/main.cpp index bfe8899..1c0b010 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -4,7 +4,7 @@ #include "autowalker.hpp" #include "ai/ai.hpp" #include -#include "shaders.hpp" +#include "graphics/shaders.hpp" #include "gui/backend.hpp" #include "game_level.hpp" #include "camera.hpp" diff --git a/src/map.hpp b/src/map.hpp index 12bdee1..851d89d 100644 --- a/src/map.hpp +++ b/src/map.hpp @@ -6,7 +6,7 @@ #include #include #include "point.hpp" -#include "lights.hpp" +#include "graphics/lights.hpp" #include "algos/pathing.hpp" #include "algos/matrix.hpp" #include "constants.hpp" diff --git a/src/meson.build b/src/meson.build index b9fe4ef..0ecf366 100644 --- a/src/meson.build +++ b/src/meson.build @@ -35,10 +35,10 @@ sources = files( # graphics 'graphics/textures.cpp', 'graphics/palette.cpp', - 'shaders.cpp', - 'scene.cpp', - 'animation.cpp', - 'lights.cpp', + 'graphics/shaders.cpp', + 'graphics/scene.cpp', + 'graphics/animation.cpp', + 'graphics/lights.cpp', 'raycaster.cpp', 'easing.cpp', 'camera.cpp', diff --git a/src/raycaster.cpp b/src/raycaster.cpp index cd66f2c..fa632b1 100644 --- a/src/raycaster.cpp +++ b/src/raycaster.cpp @@ -10,8 +10,8 @@ #include "components.hpp" #include "graphics/textures.hpp" #include "systems.hpp" -#include "shaders.hpp" -#include "animation.hpp" +#include "graphics/shaders.hpp" +#include "graphics/animation.hpp" using namespace fmt; using std::make_unique, std::shared_ptr; diff --git a/src/systems.cpp b/src/systems.cpp index beb09ba..f049475 100644 --- a/src/systems.cpp +++ b/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 -#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; diff --git a/src/worldbuilder.cpp b/src/worldbuilder.cpp index 184cba0..2c06356 100644 --- a/src/worldbuilder.cpp +++ b/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; diff --git a/tests/animation.cpp b/tests/animation.cpp index 08b619e..7e8592b 100644 --- a/tests/animation.cpp +++ b/tests/animation.cpp @@ -7,7 +7,7 @@ #include #include #include "algos/rand.hpp" -#include "animation.hpp" +#include "graphics/animation.hpp" #include "sound.hpp" #include "components.hpp" diff --git a/tests/lighting.cpp b/tests/lighting.cpp index 3f7d7df..d0f9bed 100644 --- a/tests/lighting.cpp +++ b/tests/lighting.cpp @@ -4,7 +4,7 @@ #include #include "map.hpp" #include "game_level.hpp" -#include "lights.hpp" +#include "graphics/lights.hpp" #include "point.hpp" using namespace lighting; diff --git a/tests/shaders.cpp b/tests/shaders.cpp index 2b210ff..cf86e4f 100644 --- a/tests/shaders.cpp +++ b/tests/shaders.cpp @@ -1,7 +1,7 @@ #include #include #include -#include "shaders.hpp" +#include "graphics/shaders.hpp" using namespace fmt; diff --git a/tools/animator.cpp b/tools/animator.cpp index bb3a6cd..3f6e72e 100644 --- a/tools/animator.cpp +++ b/tools/animator.cpp @@ -2,10 +2,10 @@ #include "sound.hpp" #include "ai/ai.hpp" #include -#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 #include diff --git a/tools/arena.cpp b/tools/arena.cpp index 0bfc2a2..4c3732e 100644 --- a/tools/arena.cpp +++ b/tools/arena.cpp @@ -3,7 +3,7 @@ #include "autowalker.hpp" #include "ai/ai.hpp" #include -#include "shaders.hpp" +#include "graphics/shaders.hpp" #include "gui/backend.hpp" #include "game_level.hpp" #include "boss/system.hpp" diff --git a/tools/storyboard.cpp b/tools/storyboard.cpp index 96bed33..7f94ba4 100644 --- a/tools/storyboard.cpp +++ b/tools/storyboard.cpp @@ -2,7 +2,7 @@ #include "graphics/textures.hpp" #include "sound.hpp" #include -#include "shaders.hpp" +#include "graphics/shaders.hpp" #include "constants.hpp" #include "gui/backend.hpp" #include "gui/event_router.hpp"