From 39164bffa51199c22a2d5f11d0677b2b78a6b9be Mon Sep 17 00:00:00 2001 From: Asuro Date: Sat, 29 Mar 2025 17:27:17 +0100 Subject: [PATCH] move imgui helper files --- src/CMakeLists.txt | 6 ++++-- .../rendering => dependency/imgui-bgfx}/droidsans.ttf.h | 0 .../imgui-bgfx}/fs_imgui_image.bin.h | 0 .../rendering => dependency/imgui-bgfx}/fs_imgui_image.sc | 0 .../imgui-bgfx}/fs_ocornut_imgui.bin.h | 0 .../rendering => dependency/imgui-bgfx}/fs_ocornut_imgui.sc | 0 .../imgui-bgfx}/icons_font_awesome.ttf.h | 0 .../rendering => dependency/imgui-bgfx}/icons_kenney.ttf.h | 0 .../rendering => dependency/imgui-bgfx}/imgui-helper.cpp | 0 .../rendering => dependency/imgui-bgfx}/imgui-helper.h | 0 .../imgui-bgfx}/roboto_regular.ttf.h | 0 .../imgui-bgfx}/robotomono_regular.ttf.h | 0 .../rendering => dependency/imgui-bgfx}/varying.def.sc | 0 .../imgui-bgfx}/vs_imgui_image.bin.h | 0 .../rendering => dependency/imgui-bgfx}/vs_imgui_image.sc | 0 .../imgui-bgfx}/vs_ocornut_imgui.bin.h | 0 .../rendering => dependency/imgui-bgfx}/vs_ocornut_imgui.sc | 0 17 files changed, 4 insertions(+), 2 deletions(-) rename src/{game/rendering => dependency/imgui-bgfx}/droidsans.ttf.h (100%) rename src/{game/rendering => dependency/imgui-bgfx}/fs_imgui_image.bin.h (100%) rename src/{game/rendering => dependency/imgui-bgfx}/fs_imgui_image.sc (100%) rename src/{game/rendering => dependency/imgui-bgfx}/fs_ocornut_imgui.bin.h (100%) rename src/{game/rendering => dependency/imgui-bgfx}/fs_ocornut_imgui.sc (100%) rename src/{game/rendering => dependency/imgui-bgfx}/icons_font_awesome.ttf.h (100%) rename src/{game/rendering => dependency/imgui-bgfx}/icons_kenney.ttf.h (100%) rename src/{game/rendering => dependency/imgui-bgfx}/imgui-helper.cpp (100%) rename src/{game/rendering => dependency/imgui-bgfx}/imgui-helper.h (100%) rename src/{game/rendering => dependency/imgui-bgfx}/roboto_regular.ttf.h (100%) rename src/{game/rendering => dependency/imgui-bgfx}/robotomono_regular.ttf.h (100%) rename src/{game/rendering => dependency/imgui-bgfx}/varying.def.sc (100%) rename src/{game/rendering => dependency/imgui-bgfx}/vs_imgui_image.bin.h (100%) rename src/{game/rendering => dependency/imgui-bgfx}/vs_imgui_image.sc (100%) rename src/{game/rendering => dependency/imgui-bgfx}/vs_ocornut_imgui.bin.h (100%) rename src/{game/rendering => dependency/imgui-bgfx}/vs_ocornut_imgui.sc (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f8cd825..e84c618 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -39,10 +39,12 @@ add_custom_command( file(GLOB_RECURSE sources_game game/*.cpp game/*.h gen/Generated.cpp gen/Generated.h gen/Def.h gen/Def.cpp) file(GLOB source_singleheader dependency/tinygltf/stb_image.h dependency/tinygltf/stb_image_write.h dependency/tinygltf/json.hpp dependency/tinygltf/tiny_gltf.h) -add_library(PuzGame SHARED ${sources_game} ${source_singleheader} ${imgui_sources} ${imgui_backend_sdl}) +file(GLOB sources_imgui_helper dependency/imgui-bgfx/imgui-helper.h dependency/imgui-bgfx/imgui-helper.cpp) +add_library(PuzGame SHARED ${sources_game} ${source_singleheader} ${imgui_sources} ${imgui_backend_sdl} ${sources_imgui_helper}) set_property(TARGET PuzGame PROPERTY CXX_STANDARD 17) target_include_directories(PuzGame PUBLIC dependency/imgui) -target_include_directories(PuzGame PUBLIC dependency/tracy/public/) +target_include_directories(PuzGame PUBLIC dependency/tracy/public) +target_include_directories(PuzGame PUBLIC dependency/imgui-bgfx) # Profiling option(TRACY_ENABLE "" OFF) diff --git a/src/game/rendering/droidsans.ttf.h b/src/dependency/imgui-bgfx/droidsans.ttf.h similarity index 100% rename from src/game/rendering/droidsans.ttf.h rename to src/dependency/imgui-bgfx/droidsans.ttf.h diff --git a/src/game/rendering/fs_imgui_image.bin.h b/src/dependency/imgui-bgfx/fs_imgui_image.bin.h similarity index 100% rename from src/game/rendering/fs_imgui_image.bin.h rename to src/dependency/imgui-bgfx/fs_imgui_image.bin.h diff --git a/src/game/rendering/fs_imgui_image.sc b/src/dependency/imgui-bgfx/fs_imgui_image.sc similarity index 100% rename from src/game/rendering/fs_imgui_image.sc rename to src/dependency/imgui-bgfx/fs_imgui_image.sc diff --git a/src/game/rendering/fs_ocornut_imgui.bin.h b/src/dependency/imgui-bgfx/fs_ocornut_imgui.bin.h similarity index 100% rename from src/game/rendering/fs_ocornut_imgui.bin.h rename to src/dependency/imgui-bgfx/fs_ocornut_imgui.bin.h diff --git a/src/game/rendering/fs_ocornut_imgui.sc b/src/dependency/imgui-bgfx/fs_ocornut_imgui.sc similarity index 100% rename from src/game/rendering/fs_ocornut_imgui.sc rename to src/dependency/imgui-bgfx/fs_ocornut_imgui.sc diff --git a/src/game/rendering/icons_font_awesome.ttf.h b/src/dependency/imgui-bgfx/icons_font_awesome.ttf.h similarity index 100% rename from src/game/rendering/icons_font_awesome.ttf.h rename to src/dependency/imgui-bgfx/icons_font_awesome.ttf.h diff --git a/src/game/rendering/icons_kenney.ttf.h b/src/dependency/imgui-bgfx/icons_kenney.ttf.h similarity index 100% rename from src/game/rendering/icons_kenney.ttf.h rename to src/dependency/imgui-bgfx/icons_kenney.ttf.h diff --git a/src/game/rendering/imgui-helper.cpp b/src/dependency/imgui-bgfx/imgui-helper.cpp similarity index 100% rename from src/game/rendering/imgui-helper.cpp rename to src/dependency/imgui-bgfx/imgui-helper.cpp diff --git a/src/game/rendering/imgui-helper.h b/src/dependency/imgui-bgfx/imgui-helper.h similarity index 100% rename from src/game/rendering/imgui-helper.h rename to src/dependency/imgui-bgfx/imgui-helper.h diff --git a/src/game/rendering/roboto_regular.ttf.h b/src/dependency/imgui-bgfx/roboto_regular.ttf.h similarity index 100% rename from src/game/rendering/roboto_regular.ttf.h rename to src/dependency/imgui-bgfx/roboto_regular.ttf.h diff --git a/src/game/rendering/robotomono_regular.ttf.h b/src/dependency/imgui-bgfx/robotomono_regular.ttf.h similarity index 100% rename from src/game/rendering/robotomono_regular.ttf.h rename to src/dependency/imgui-bgfx/robotomono_regular.ttf.h diff --git a/src/game/rendering/varying.def.sc b/src/dependency/imgui-bgfx/varying.def.sc similarity index 100% rename from src/game/rendering/varying.def.sc rename to src/dependency/imgui-bgfx/varying.def.sc diff --git a/src/game/rendering/vs_imgui_image.bin.h b/src/dependency/imgui-bgfx/vs_imgui_image.bin.h similarity index 100% rename from src/game/rendering/vs_imgui_image.bin.h rename to src/dependency/imgui-bgfx/vs_imgui_image.bin.h diff --git a/src/game/rendering/vs_imgui_image.sc b/src/dependency/imgui-bgfx/vs_imgui_image.sc similarity index 100% rename from src/game/rendering/vs_imgui_image.sc rename to src/dependency/imgui-bgfx/vs_imgui_image.sc diff --git a/src/game/rendering/vs_ocornut_imgui.bin.h b/src/dependency/imgui-bgfx/vs_ocornut_imgui.bin.h similarity index 100% rename from src/game/rendering/vs_ocornut_imgui.bin.h rename to src/dependency/imgui-bgfx/vs_ocornut_imgui.bin.h diff --git a/src/game/rendering/vs_ocornut_imgui.sc b/src/dependency/imgui-bgfx/vs_ocornut_imgui.sc similarity index 100% rename from src/game/rendering/vs_ocornut_imgui.sc rename to src/dependency/imgui-bgfx/vs_ocornut_imgui.sc