From 382ef678956f330006e412002e56f2e74258f5cc Mon Sep 17 00:00:00 2001 From: Sven Balzer <4653051+Kyuusokuna@users.noreply.github.com> Date: Wed, 26 Mar 2025 19:25:38 +0100 Subject: [PATCH] move shaders from assets to src --- CMakeLists.txt | 4 ++-- src/main.cpp | 8 ++++---- {assets/shader => src/shaders}/basic.h | 0 {assets/shader => src/shaders}/basic.slang | 0 {assets/shader => src/shaders}/common.slang | 0 {assets/shader => src/shaders}/grid.h | 0 {assets/shader => src/shaders}/grid.slang | 0 {assets/shader => src/shaders}/gui_tile.h | 0 {assets/shader => src/shaders}/gui_tile.slang | 0 {assets/shader => src/shaders}/world.h | 0 {assets/shader => src/shaders}/world.slang | 0 11 files changed, 6 insertions(+), 6 deletions(-) rename {assets/shader => src/shaders}/basic.h (100%) rename {assets/shader => src/shaders}/basic.slang (100%) rename {assets/shader => src/shaders}/common.slang (100%) rename {assets/shader => src/shaders}/grid.h (100%) rename {assets/shader => src/shaders}/grid.slang (100%) rename {assets/shader => src/shaders}/gui_tile.h (100%) rename {assets/shader => src/shaders}/gui_tile.slang (100%) rename {assets/shader => src/shaders}/world.h (100%) rename {assets/shader => src/shaders}/world.slang (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 46d575c..47c52aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,8 +45,8 @@ option(TRACY_ONLY_LOCALHOST "" ON) add_subdirectory(libs/tracy) function(add_shader name) - set(INPUT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/assets/shader/${name}.slang) - set(OUTPUT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/assets/shader/${name}.h) + set(INPUT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/src/shaders/${name}.slang) + set(OUTPUT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/src/shaders/${name}.h) set(DEP_FILE ${CMAKE_CURRENT_BINARY_DIR}/SHADER_${name}.dep) if (SLANGC) diff --git a/src/main.cpp b/src/main.cpp index 3222d88..6016555 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -13,10 +13,10 @@ #include "math_graphics.h" #include "stb_image.h" -#include "../assets/shader/basic.h" -#include "../assets/shader/world.h" -#include "../assets/shader/gui_tile.h" -#include "../assets/shader/grid.h" +#include "shaders/basic.h" +#include "shaders/world.h" +#include "shaders/gui_tile.h" +#include "shaders/grid.h" using namespace M; diff --git a/assets/shader/basic.h b/src/shaders/basic.h similarity index 100% rename from assets/shader/basic.h rename to src/shaders/basic.h diff --git a/assets/shader/basic.slang b/src/shaders/basic.slang similarity index 100% rename from assets/shader/basic.slang rename to src/shaders/basic.slang diff --git a/assets/shader/common.slang b/src/shaders/common.slang similarity index 100% rename from assets/shader/common.slang rename to src/shaders/common.slang diff --git a/assets/shader/grid.h b/src/shaders/grid.h similarity index 100% rename from assets/shader/grid.h rename to src/shaders/grid.h diff --git a/assets/shader/grid.slang b/src/shaders/grid.slang similarity index 100% rename from assets/shader/grid.slang rename to src/shaders/grid.slang diff --git a/assets/shader/gui_tile.h b/src/shaders/gui_tile.h similarity index 100% rename from assets/shader/gui_tile.h rename to src/shaders/gui_tile.h diff --git a/assets/shader/gui_tile.slang b/src/shaders/gui_tile.slang similarity index 100% rename from assets/shader/gui_tile.slang rename to src/shaders/gui_tile.slang diff --git a/assets/shader/world.h b/src/shaders/world.h similarity index 100% rename from assets/shader/world.h rename to src/shaders/world.h diff --git a/assets/shader/world.slang b/src/shaders/world.slang similarity index 100% rename from assets/shader/world.slang rename to src/shaders/world.slang