From f460add0afea388bacafa3ad55cc5fe86290186c Mon Sep 17 00:00:00 2001 From: "Zed A. Shaw" Date: Fri, 27 Feb 2026 14:11:13 -0500 Subject: [PATCH] Graphics reorg done. --- meson.build | 1 - src/graphics/animation.hpp | 2 +- src/{ => graphics}/camera.cpp | 2 +- src/{ => graphics}/camera.hpp | 0 src/{ => graphics}/easing.cpp | 0 src/{ => graphics}/easing.hpp | 0 src/{ => graphics}/raycaster.cpp | 2 +- src/{ => graphics}/raycaster.hpp | 0 src/graphics/scene.hpp | 2 +- src/gui/main_ui.hpp | 2 +- src/main.cpp | 2 +- src/meson.build | 6 +++--- src/storyboard/ui.hpp | 2 +- tools/arena.cpp | 2 +- tools/storyboard.cpp | 2 +- 15 files changed, 12 insertions(+), 13 deletions(-) rename src/{ => graphics}/camera.cpp (99%) rename src/{ => graphics}/camera.hpp (100%) rename src/{ => graphics}/easing.cpp (100%) rename src/{ => graphics}/easing.hpp (100%) rename src/{ => graphics}/raycaster.cpp (99%) rename src/{ => graphics}/raycaster.hpp (100%) diff --git a/meson.build b/meson.build index e8376b9..d210774 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,3 @@ -# clang might need _LIBCPP_ENABLE_CXX26_REMOVED_CODECVT project('raycaster', 'cpp', version: '0.1.0', diff --git a/src/graphics/animation.hpp b/src/graphics/animation.hpp index f01de8f..2b97f43 100644 --- a/src/graphics/animation.hpp +++ b/src/graphics/animation.hpp @@ -8,7 +8,7 @@ #include #include #include -#include "easing.hpp" +#include "graphics/easing.hpp" #include #include "json_mods.hpp" #include diff --git a/src/camera.cpp b/src/graphics/camera.cpp similarity index 99% rename from src/camera.cpp rename to src/graphics/camera.cpp index 9dda552..f49e3ac 100644 --- a/src/camera.cpp +++ b/src/graphics/camera.cpp @@ -1,4 +1,4 @@ -#include "camera.hpp" +#include "graphics/camera.hpp" #include #include "components.hpp" #include "config.hpp" diff --git a/src/camera.hpp b/src/graphics/camera.hpp similarity index 100% rename from src/camera.hpp rename to src/graphics/camera.hpp diff --git a/src/easing.cpp b/src/graphics/easing.cpp similarity index 100% rename from src/easing.cpp rename to src/graphics/easing.cpp diff --git a/src/easing.hpp b/src/graphics/easing.hpp similarity index 100% rename from src/easing.hpp rename to src/graphics/easing.hpp diff --git a/src/raycaster.cpp b/src/graphics/raycaster.cpp similarity index 99% rename from src/raycaster.cpp rename to src/graphics/raycaster.cpp index fa632b1..28c61d7 100644 --- a/src/raycaster.cpp +++ b/src/graphics/raycaster.cpp @@ -1,4 +1,4 @@ -#include "raycaster.hpp" +#include "graphics/raycaster.hpp" #include "dbc.hpp" #include "algos/matrix.hpp" #include diff --git a/src/raycaster.hpp b/src/graphics/raycaster.hpp similarity index 100% rename from src/raycaster.hpp rename to src/graphics/raycaster.hpp diff --git a/src/graphics/scene.hpp b/src/graphics/scene.hpp index c4d582c..81201d2 100644 --- a/src/graphics/scene.hpp +++ b/src/graphics/scene.hpp @@ -5,7 +5,7 @@ #include "graphics/textures.hpp" #include #include -#include "camera.hpp" +#include "graphics/camera.hpp" #include #include "graphics/animation.hpp" #include "components.hpp" diff --git a/src/gui/main_ui.hpp b/src/gui/main_ui.hpp index 7093e74..7cb35af 100644 --- a/src/gui/main_ui.hpp +++ b/src/gui/main_ui.hpp @@ -5,7 +5,7 @@ #include #include "gui/overlay_ui.hpp" #include "gui/debug_ui.hpp" -#include "raycaster.hpp" +#include "graphics/raycaster.hpp" #include namespace animation { diff --git a/src/main.cpp b/src/main.cpp index 1c0b010..e944f07 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -7,7 +7,7 @@ #include "graphics/shaders.hpp" #include "gui/backend.hpp" #include "game_level.hpp" -#include "camera.hpp" +#include "graphics/camera.hpp" int main(int argc, char* argv[]) { try { diff --git a/src/meson.build b/src/meson.build index 0ecf366..c94ff37 100644 --- a/src/meson.build +++ b/src/meson.build @@ -39,9 +39,9 @@ sources = files( 'graphics/scene.cpp', 'graphics/animation.cpp', 'graphics/lights.cpp', - 'raycaster.cpp', - 'easing.cpp', - 'camera.cpp', + 'graphics/raycaster.cpp', + 'graphics/easing.cpp', + 'graphics/camera.cpp', # algos 'algos/matrix.cpp', diff --git a/src/storyboard/ui.hpp b/src/storyboard/ui.hpp index e801ef8..f434613 100644 --- a/src/storyboard/ui.hpp +++ b/src/storyboard/ui.hpp @@ -1,7 +1,7 @@ #pragma once #include "constants.hpp" #include -#include "camera.hpp" +#include "graphics/camera.hpp" #include #include "components.hpp" diff --git a/tools/arena.cpp b/tools/arena.cpp index 4c3732e..294ef52 100644 --- a/tools/arena.cpp +++ b/tools/arena.cpp @@ -10,7 +10,7 @@ #include "events.hpp" #include "constants.hpp" #include "gui/event_router.hpp" -#include "camera.hpp" +#include "graphics/camera.hpp" void craft_weapon() { auto world = GameDB::current_world(); diff --git a/tools/storyboard.cpp b/tools/storyboard.cpp index 7f94ba4..0b609bb 100644 --- a/tools/storyboard.cpp +++ b/tools/storyboard.cpp @@ -6,7 +6,7 @@ #include "constants.hpp" #include "gui/backend.hpp" #include "gui/event_router.hpp" -#include "camera.hpp" +#include "graphics/camera.hpp" #include "storyboard/ui.hpp" int main(int, char*[]) {