hyzboy/ULRE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMAKE工程文件增加配置DEBUG目录功能，使得资源不用复制到运行目录

Browse Source
This commit is contained in:
hyzboy 2019-07-10 21:21:17 +08:00
parent b7954338aa
commit f4268b02ba
12 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -57,6 +57,8 @@ SET(SPIRV_CROSS_PATH ${CMAKE_CURRENT_SOURCE_DIR}/3rdpty/SPIRV-Cross)
include_directories(${SPIRV_CROSS_PATH}) include_directories(${SPIRV_CROSS_PATH})
add_subdirectory(${SPIRV_CROSS_PATH}) add_subdirectory(${SPIRV_CROSS_PATH})
SET(ULRE_RUNTIME_PATH ${CMAKE_CURRENT_SOURCE_DIR})
add_subdirectory(3rdpty/MathGeoLib) add_subdirectory(3rdpty/MathGeoLib)
add_subdirectory(3rdpty/NvTriStrip) add_subdirectory(3rdpty/NvTriStrip)
add_subdirectory(3rdpty/assimp) add_subdirectory(3rdpty/assimp)

4
example/Vulkan/Atomsphere.cpp
View File

@ -42,8 +42,8 @@ private:
bool InitMaterial() bool InitMaterial()
{ {
material=shader_manage->CreateMaterial(OS_TEXT("Atomsphere.vert.spv"), material=shader_manage->CreateMaterial(OS_TEXT("res/shader/Atomsphere.vert.spv"),
OS_TEXT("Atomsphere.frag.spv")); OS_TEXT("res/shader/Atomsphere.frag.spv"));
if(!material) if(!material)
return(false); return(false);

4
example/Vulkan/CMakeLists.txt
View File

@ -1,6 +1,10 @@
macro(CreateProject name) macro(CreateProject name)
add_executable(${name} ${ARGN} VulkanAppFramework.h) add_executable(${name} ${ARGN} VulkanAppFramework.h)
target_link_libraries(${name} ${ULRE}) target_link_libraries(${name} ${ULRE})
IF(WIN32)
set_target_properties(${name} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY ${ULRE_RUNTIME_PATH})
ENDIF()
endmacro() endmacro()
CreateProject(0.triangle main.cpp) CreateProject(0.triangle main.cpp)

10
example/Vulkan/Deferred.cpp
View File

@ -251,15 +251,15 @@ private:
bool InitMaterial() bool InitMaterial()
{ {
if(!InitSubpass(&sp_gbuffer, OS_TEXT("gbuffer_opaque.vert.spv"),OS_TEXT("gbuffer_opaque.frag.spv")))return(false); if(!InitSubpass(&sp_gbuffer, OS_TEXT("res/shader/gbuffer_opaque.vert.spv"),OS_TEXT("res/shader/gbuffer_opaque.frag.spv")))return(false);
//if(!InitSubpass(&sp_composition,OS_TEXT("ds_composition.vert.spv"),OS_TEXT("ds_composition.frag.spv")))return(false); //if(!InitSubpass(&sp_composition,OS_TEXT("res/shader/ds_composition.vert.spv"),OS_TEXT("res/shader/ds_composition.frag.spv")))return(false);
if(!InitGBufferPipeline(&sp_gbuffer))return(false); if(!InitGBufferPipeline(&sp_gbuffer))return(false);
//if(!InitCompositionPipeline(&sp_composition))return(false); //if(!InitCompositionPipeline(&sp_composition))return(false);
texture.color =vulkan::LoadTGATexture(OS_TEXT("cardboardPlainStain.tga"),device); texture.color =vulkan::LoadTGATexture(OS_TEXT("res/image/cardboardPlainStain.tga"),device);
texture.normal =vulkan::LoadTGATexture(OS_TEXT("APOCWALL029_NRM.tga"),device); texture.normal =vulkan::LoadTGATexture(OS_TEXT("res/image/APOCWALL029_NRM.tga"),device);
//texture.specular=vulkan::LoadTGATexture(OS_TEXT("APOCWALL029_SPEC.tga"),device); //texture.specular=vulkan::LoadTGATexture(OS_TEXT("res/image/APOCWALL029_SPEC.tga"),device);
VkSamplerCreateInfo sampler_create_info; VkSamplerCreateInfo sampler_create_info;

4
example/Vulkan/Geometry2D.cpp
View File

@ -47,8 +47,8 @@ private:
bool InitMaterial() bool InitMaterial()
{ {
material=shader_manage->CreateMaterial(OS_TEXT("OnlyPosition.vert.spv"), material=shader_manage->CreateMaterial(OS_TEXT("res/shader/OnlyPosition.vert.spv"),
OS_TEXT("FlatColor.frag.spv")); OS_TEXT("res/shader/FlatColor.frag.spv"));
if(!material) if(!material)
return(false); return(false);

4
example/Vulkan/Geometry3D.cpp
View File

@ -31,8 +31,8 @@ private:
bool InitMaterial() bool InitMaterial()
{ {
material=shader_manage->CreateMaterial(OS_TEXT("PositionColor3D.vert.spv"), material=shader_manage->CreateMaterial(OS_TEXT("res/shader/PositionColor3D.vert.spv"),
OS_TEXT("FlatColor.frag.spv")); OS_TEXT("res/shader/FlatColor.frag.spv"));
if(!material) if(!material)
return(false); return(false);

6
example/Vulkan/InlineGeometryScene.cpp
View File

@ -40,8 +40,8 @@ private:
bool InitMaterial() bool InitMaterial()
{ {
material=shader_manage->CreateMaterial(OS_TEXT("OnlyPosition3D.vert.spv"), material=shader_manage->CreateMaterial(OS_TEXT("res/shader/OnlyPosition3D.vert.spv"),
OS_TEXT("FlatColor.frag.spv")); OS_TEXT("res/shader/FlatColor.frag.spv"));
if(!material) if(!material)
return(false); return(false);
@ -151,7 +151,7 @@ private:
db->Add(pipeline_line); db->Add(pipeline_line);
pipeline_creater->Set(PRIM_TRIANGLES); pipeline_creater->Set(PRIM_TRIANGLES);
pipeline_creater->SetPolygonMode(VK_POLYGON_MODE_LINE); pipeline_creater->SetPolygonMode(VK_POLYGON_MODE_FILL);
pipeline_solid=pipeline_creater->Create(); pipeline_solid=pipeline_creater->Create();
if(!pipeline_solid) if(!pipeline_solid)

4
example/Vulkan/LoadModel.cpp
View File

@ -103,8 +103,8 @@ private:
bool InitMaterial() bool InitMaterial()
{ {
material=shader_manage->CreateMaterial(OS_TEXT("OnlyPosition3D.vert.spv"), material=shader_manage->CreateMaterial(OS_TEXT("res/shader/OnlyPosition3D.vert.spv"),
OS_TEXT("FlatColor.frag.spv")); OS_TEXT("res/shader/FlatColor.frag.spv"));
if(!material) if(!material)
return(false); return(false);

4
example/Vulkan/SceneTree.cpp
View File

@ -44,8 +44,8 @@ private:
bool InitMaterial() bool InitMaterial()
{ {
material=shader_manage->CreateMaterial(OS_TEXT("OnlyPosition3D.vert.spv"), material=shader_manage->CreateMaterial(OS_TEXT("res/shader/OnlyPosition3D.vert.spv"),
OS_TEXT("FlatColor.frag.spv")); OS_TEXT("res/shader/FlatColor.frag.spv"));
if(!material) if(!material)
return(false); return(false);

4
example/Vulkan/indices_rect.cpp
View File

@ -64,8 +64,8 @@ private:
bool InitMaterial() bool InitMaterial()
{ {
material=shader_manage->CreateMaterial(OS_TEXT("OnlyPosition.vert.spv"), material=shader_manage->CreateMaterial(OS_TEXT("res/shader/OnlyPosition.vert.spv"),
OS_TEXT("FlatColor.frag.spv")); OS_TEXT("res/shader/FlatColor.frag.spv"));
if(!material) if(!material)
return(false); return(false);

4
example/Vulkan/main.cpp
View File

@ -65,8 +65,8 @@ private:
bool InitMaterial() bool InitMaterial()
{ {
material=shader_manage->CreateMaterial(OS_TEXT("FlatColor.vert.spv"), material=shader_manage->CreateMaterial(OS_TEXT("res/shader/FlatColor.vert.spv"),
OS_TEXT("FlatColor.frag.spv")); OS_TEXT("res/shader/FlatColor.frag.spv"));
if(!material) if(!material)
return(false); return(false);

4
example/Vulkan/texture_rect.cpp
View File

@ -84,8 +84,8 @@ private:
bool InitMaterial() bool InitMaterial()
{ {
material=shader_manage->CreateMaterial(OS_TEXT("FlatTexture.vert.spv"), material=shader_manage->CreateMaterial(OS_TEXT("res/shader/FlatTexture.vert.spv"),
OS_TEXT("FlatTexture.frag.spv")); OS_TEXT("res/shader/FlatTexture.frag.spv"));
if(!material) if(!material)
return(false); return(false);