From 6c55f455c87dcd689a644d18928fa248aff29a4e Mon Sep 17 00:00:00 2001
From: Lava Block <the@lava-block.com>
Date: Sat, 22 May 2021 13:20:25 +0200
Subject: [PATCH] move res/tool/imgui -> res/imgui + res/font/imgui -> res/font
---
CMakeLists.txt | 4 ++--
doc/Demo.md | 2 +-
liblava/app/app.cpp | 4 ++--
liblava/app/def.hpp | 1 +
liblava/app/imgui.cpp | 4 ++--
liblava/app/imgui.hpp | 2 --
res/font/{imgui => }/Roboto-Regular.ttf | Bin
res/{tool => }/imgui/gen_spirv.bat | 0
res/{tool => }/imgui/gen_spirv.sh | 0
res/{tool => }/imgui/imgui.frag | 0
res/{tool => }/imgui/imgui.frag.u32 | 0
res/{tool => }/imgui/imgui.vert | 0
res/{tool => }/imgui/imgui.vert.u32 | 0
13 files changed, 8 insertions(+), 9 deletions(-)
rename res/font/{imgui => }/Roboto-Regular.ttf (100%)
rename res/{tool => }/imgui/gen_spirv.bat (100%)
rename res/{tool => }/imgui/gen_spirv.sh (100%)
rename res/{tool => }/imgui/imgui.frag (100%)
rename res/{tool => }/imgui/imgui.frag.u32 (100%)
rename res/{tool => }/imgui/imgui.vert (100%)
rename res/{tool => }/imgui/imgui.vert.u32 (100%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 042f0ebd..401ce51d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -326,8 +326,8 @@ set(IMGUI_FILES
source_group("imgui Files" FILES ${IMGUI_FILES})
set(APP_SHADERS
- res/tool/imgui/imgui.frag
- res/tool/imgui/imgui.vert
+ res/imgui/imgui.frag
+ res/imgui/imgui.vert
)
source_group("Shader Files" FILES ${APP_SHADERS})
diff --git a/doc/Demo.md b/doc/Demo.md
index 72b1fb82..d355bb6f 100644
--- a/doc/Demo.md
+++ b/doc/Demo.md
@@ -14,7 +14,7 @@ You can find the demonstration projects in the `liblava-demo` folder
*Apache License, Version 2.0* / [GitHub](https://github.com/google/fonts/tree/master/apache/roboto) / [Website](https://fonts.google.com/specimen/Roboto)
-* [Roboto-Regular.ttf](../res/font/imgui/Roboto-Regular.ttf)
+* [Roboto-Regular.ttf](../res/font/Roboto-Regular.ttf)
## Font Awesome
diff --git a/liblava/app/app.cpp b/liblava/app/app.cpp
index 7c4c73f1..adab17e6 100644
--- a/liblava/app/app.cpp
+++ b/liblava/app/app.cpp
@@ -159,9 +159,9 @@ namespace lava {
bool app::create_imgui() {
if (config.imgui_font.file.empty()) {
- auto font_files = file_system::enumerate_files(_imgui_font_path_);
+ auto font_files = file_system::enumerate_files(_font_path_);
if (!font_files.empty())
- config.imgui_font.file = fmt::format("{}{}", _imgui_font_path_, str(font_files.front()));
+ config.imgui_font.file = fmt::format("{}{}", _font_path_, str(font_files.front()));
}
setup_imgui_font(imgui_config, config.imgui_font);
diff --git a/liblava/app/def.hpp b/liblava/app/def.hpp
index b4a0228c..89f8a935 100644
--- a/liblava/app/def.hpp
+++ b/liblava/app/def.hpp
@@ -26,6 +26,7 @@ namespace lava {
constexpr name _lava_texture_staging_ = "lava texture staging";
// res folder
+ constexpr name _font_path_ = "font/";
constexpr name _font_icon_path_ = "font/icon/";
} // namespace lava
diff --git a/liblava/app/imgui.cpp b/liblava/app/imgui.cpp
index 2742e23f..12756aeb 100644
--- a/liblava/app/imgui.cpp
+++ b/liblava/app/imgui.cpp
@@ -280,11 +280,11 @@ namespace lava {
#undef MAP_ANALOG
static ui32 imgui_vert_shader[] = {
-#include "res/tool/imgui/imgui.vert.u32"
+#include "res/imgui/imgui.vert.u32"
};
static ui32 imgui_frag_shader[] = {
-#include "res/tool/imgui/imgui.frag.u32"
+#include "res/imgui/imgui.frag.u32"
};
bool imgui::create(graphics_pipeline::ptr p, index mf) {
diff --git a/liblava/app/imgui.hpp b/liblava/app/imgui.hpp
index c516babf..181ba322 100644
--- a/liblava/app/imgui.hpp
+++ b/liblava/app/imgui.hpp
@@ -157,8 +157,6 @@ namespace lava {
bool active = true;
};
- constexpr name _imgui_font_path_ = "font/imgui/";
-
void setup_imgui_font(imgui::config& config, imgui::font::ref font);
} // namespace lava
diff --git a/res/font/imgui/Roboto-Regular.ttf b/res/font/Roboto-Regular.ttf
similarity index 100%
rename from res/font/imgui/Roboto-Regular.ttf
rename to res/font/Roboto-Regular.ttf
diff --git a/res/tool/imgui/gen_spirv.bat b/res/imgui/gen_spirv.bat
similarity index 100%
rename from res/tool/imgui/gen_spirv.bat
rename to res/imgui/gen_spirv.bat
diff --git a/res/tool/imgui/gen_spirv.sh b/res/imgui/gen_spirv.sh
similarity index 100%
rename from res/tool/imgui/gen_spirv.sh
rename to res/imgui/gen_spirv.sh
diff --git a/res/tool/imgui/imgui.frag b/res/imgui/imgui.frag
similarity index 100%
rename from res/tool/imgui/imgui.frag
rename to res/imgui/imgui.frag
diff --git a/res/tool/imgui/imgui.frag.u32 b/res/imgui/imgui.frag.u32
similarity index 100%
rename from res/tool/imgui/imgui.frag.u32
rename to res/imgui/imgui.frag.u32
diff --git a/res/tool/imgui/imgui.vert b/res/imgui/imgui.vert
similarity index 100%
rename from res/tool/imgui/imgui.vert
rename to res/imgui/imgui.vert
diff --git a/res/tool/imgui/imgui.vert.u32 b/res/imgui/imgui.vert.u32
similarity index 100%
rename from res/tool/imgui/imgui.vert.u32
rename to res/imgui/imgui.vert.u32
--
GitLab