inksoul
/
plumageRender
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

修复imgui链接错误

main
InkSoul 2025-02-15 21:35:05 +08:00
parent d7f55c1264
commit bca2a1367f
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/CMakeLists.txt
View File

@ -36,7 +36,6 @@ include_directories(${lib_base_path})
if(WIN32) if(WIN32)
add_executable(${RenderName} WIN32 ${SHADERS_GLSL} ${SHADERS_HLSL} add_executable(${RenderName} WIN32 ${SHADERS_GLSL} ${SHADERS_HLSL}
${3rdParty_imgui_path}
${MAIN_FILE} ${MAIN_FILE}
"render/glTFModel.h" "render/glTFModel.h"
"render/glTFModel.cpp" "render/glTFModel.cpp"

6
src/base/CMakeLists.txt
View File

@ -1,4 +1,4 @@
file(GLOB BASE_SRC "*.cpp" "*.hpp" "*.h" "../3rdparty/imgui/*.cpp") file(GLOB BASE_SRC "*.cpp" "*.hpp" "*.h" "${3rdParty_imgui_path}/*.cpp" )
file(GLOB BASE_HEADERS "*.hpp" "*.h") file(GLOB BASE_HEADERS "*.hpp" "*.h")
set(KTX_DIR ${3rdPARTY_PATH}/ktx) set(KTX_DIR ${3rdPARTY_PATH}/ktx)
@ -17,8 +17,10 @@ include_directories(${3rdParty_gli_path})
include_directories(${3rdParty_vulkan_path}) include_directories(${3rdParty_vulkan_path})
include_directories(${3rdParty_imgui_path}) include_directories(${3rdParty_imgui_path})
message("======================debug=====================")
message(${BASE_SRC})
add_library(base STATIC ${BASE_SRC} ${KTX_SOURCES} ${BASE_HEADERS} ${3rdParty_imgui_path}) add_library(base STATIC ${BASE_SRC} ${KTX_SOURCES})
if(WIN32) if(WIN32)
target_link_libraries(base ${Vulkan_LIBRARY} ${WINLIBS}) target_link_libraries(base ${Vulkan_LIBRARY} ${WINLIBS})
else(WIN32) else(WIN32)

17
src/base/ui.hpp
View File

@ -1,10 +1,4 @@
 
#include <vector>
#include <array>
#include <map>
#include "vulkan/vulkan.h"
#include "imgui.h"
#include "VulkanDevice.hpp" #include "VulkanDevice.hpp"
#include "VulkanUtils.hpp" #include "VulkanUtils.hpp"
#include "VulkanTexture.hpp" #include "VulkanTexture.hpp"
@ -13,11 +7,22 @@
#include <android/asset_manager.h> #include <android/asset_manager.h>
#endif #endif
#include <vulkan/vulkan.h>
#include <imgui.h>
#include <backends/imgui_impl_vulkan.h>
#include <backends/imgui_impl_glfw.h>
#define GLM_FORCE_RADIANS #define GLM_FORCE_RADIANS
#define GLM_FORCE_DEPTH_ZERO_TO_ONE #define GLM_FORCE_DEPTH_ZERO_TO_ONE
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <glm/gtc/matrix_transform.hpp> #include <glm/gtc/matrix_transform.hpp>
#include <vector>
#include <array>
#include <map>
struct UI { struct UI {
private: private:
VkDevice device; VkDevice device;