From 253d1133758406c0692d802df92179911d9319cf Mon Sep 17 00:00:00 2001 From: "HuYingzhuo(hugo/hyzboy)" Date: Wed, 27 Sep 2023 11:36:39 +0800 Subject: [PATCH] adjusted path of examples. --- CMSceneGraph | 2 +- example/Basic/CMakeLists.txt | 16 ++++++++++++++++ .../auto_instance.cpp} | 3 +-- .../auto_merge_material_instance.cpp} | 3 +-- .../draw_triangle_in_NDC.cpp} | 3 +-- .../draw_triangle_use_UBO.cpp} | 3 +-- example/CMakeLists.txt | 2 ++ example/Texture/CMakeLists.txt | 16 ++++++++++++++++ .../texture_format_list.cpp} | 0 example/{Vulkan => Texture}/texture_quad.cpp | 3 +-- example/{Vulkan => Texture}/texture_rect.cpp | 3 +-- .../{Vulkan => Texture}/texture_rect_array.cpp | 3 +-- example/Vulkan/CMakeLists.txt | 10 ---------- 13 files changed, 42 insertions(+), 25 deletions(-) create mode 100644 example/Basic/CMakeLists.txt rename example/{Vulkan/third_triangle.cpp => Basic/auto_instance.cpp} (95%) rename example/{Vulkan/fourth_triangle.cpp => Basic/auto_merge_material_instance.cpp} (92%) rename example/{Vulkan/first_triangle.cpp => Basic/draw_triangle_in_NDC.cpp} (97%) rename example/{Vulkan/second_triangle.cpp => Basic/draw_triangle_use_UBO.cpp} (95%) create mode 100644 example/Texture/CMakeLists.txt rename example/{Vulkan/TextureFormat.cpp => Texture/texture_format_list.cpp} (100%) rename example/{Vulkan => Texture}/texture_quad.cpp (98%) rename example/{Vulkan => Texture}/texture_rect.cpp (98%) rename example/{Vulkan => Texture}/texture_rect_array.cpp (98%) diff --git a/CMSceneGraph b/CMSceneGraph index 76db378d..a11148b3 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit 76db378dd4d992e40ecf05cc5a959ac381f426e6 +Subproject commit a11148b38dd39d25aa6a4493c0028c482c8a5d2b diff --git a/example/Basic/CMakeLists.txt b/example/Basic/CMakeLists.txt new file mode 100644 index 00000000..9b790d43 --- /dev/null +++ b/example/Basic/CMakeLists.txt @@ -0,0 +1,16 @@ +macro(CreateProject name) + add_executable(${name} ${ARGN} ${VULKAN_APP_FRAMEWORK}) + target_link_libraries(${name} ${ULRE}) + + IF(MSVC) + set_target_properties(${name} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY ${ULRE_RUNTIME_PATH}) + set_property(TARGET ${name} PROPERTY VS_DPI_AWARE "PerMonitor") + ENDIF() + + set_property(TARGET ${name} PROPERTY FOLDER "ULRE/Example/Vulkan/Basic") +endmacro() + +CreateProject(01_draw_triangle_in_NDC draw_triangle_in_NDC.cpp) +CreateProject(02_draw_triangle_use_UBO draw_triangle_use_UBO.cpp) +CreateProject(03_auto_instance auto_instance.cpp) +CreateProject(04_auto_merge_material_instance auto_merge_material_instance.cpp) diff --git a/example/Vulkan/third_triangle.cpp b/example/Basic/auto_instance.cpp similarity index 95% rename from example/Vulkan/third_triangle.cpp rename to example/Basic/auto_instance.cpp index df7a8425..351fef28 100644 --- a/example/Vulkan/third_triangle.cpp +++ b/example/Basic/auto_instance.cpp @@ -1,5 +1,4 @@ -// AutoInstance -// 该范例主要演示使用RenderList系统绘制多个三角形，并利用RenderList进行排序以及自动合并进行Instance渲染 +// 该范例主要演示使用RenderList系统绘制多个三角形，并利用RenderList进行排序以及自动合并进行Instance渲染 #include"VulkanAppFramework.h" #include diff --git a/example/Vulkan/fourth_triangle.cpp b/example/Basic/auto_merge_material_instance.cpp similarity index 92% rename from example/Vulkan/fourth_triangle.cpp rename to example/Basic/auto_merge_material_instance.cpp index cac1f0be..2b0e0894 100644 --- a/example/Vulkan/fourth_triangle.cpp +++ b/example/Basic/auto_merge_material_instance.cpp @@ -1,5 +1,4 @@ -// AutoMergeMaterialInstance -// 该范例主要演示使用一个材质下的不同材质实例传递颜色参数绘制三角形，并依赖RenderList中的自动合并功能，让同一材质下所有不同材质实例的对象一次渲染完成。 +// 该范例主要演示使用一个材质下的不同材质实例传递颜色参数绘制三角形，并依赖RenderList中的自动合并功能，让同一材质下所有不同材质实例的对象一次渲染完成。 #include"VulkanAppFramework.h" #include diff --git a/example/Vulkan/first_triangle.cpp b/example/Basic/draw_triangle_in_NDC.cpp similarity index 97% rename from example/Vulkan/first_triangle.cpp rename to example/Basic/draw_triangle_in_NDC.cpp index 5d724e3e..554c9ce0 100644 --- a/example/Vulkan/first_triangle.cpp +++ b/example/Basic/draw_triangle_in_NDC.cpp @@ -1,5 +1,4 @@ -// first_triangle -// 该范例主要演示使用NDC坐标系直接绘制一个渐变色的三角形 +// 该范例主要演示使用NDC坐标系直接绘制一个渐变色的三角形 #include"VulkanAppFramework.h" #include diff --git a/example/Vulkan/second_triangle.cpp b/example/Basic/draw_triangle_use_UBO.cpp similarity index 95% rename from example/Vulkan/second_triangle.cpp rename to example/Basic/draw_triangle_use_UBO.cpp index a7c27f8f..34352adc 100644 --- a/example/Vulkan/second_triangle.cpp +++ b/example/Basic/draw_triangle_use_UBO.cpp @@ -1,5 +1,4 @@ -// second_triangle -// 该范例主要演示使用2D坐系统直接绘制一个渐变色的三角形,使用UBO传递Viewport信息 +// 该范例主要演示使用2D坐系统直接绘制一个渐变色的三角形,使用UBO传递Viewport信息 #include"VulkanAppFramework.h" #include diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index aa6ec432..d5982618 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -2,6 +2,8 @@ SET(VULKAN_APP_FRAMEWORK ${CMAKE_CURRENT_SOURCE_DIR}/common/VulkanAppFramework.h) +add_subdirectory(Basic) +add_subdirectory(Texture) add_subdirectory(Vulkan) add_subdirectory(2dVector) add_subdirectory(GUI) diff --git a/example/Texture/CMakeLists.txt b/example/Texture/CMakeLists.txt new file mode 100644 index 00000000..302fac09 --- /dev/null +++ b/example/Texture/CMakeLists.txt @@ -0,0 +1,16 @@ +macro(CreateProject name) + add_executable(${name} ${ARGN} ${VULKAN_APP_FRAMEWORK}) + target_link_libraries(${name} ${ULRE}) + + IF(MSVC) + set_target_properties(${name} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY ${ULRE_RUNTIME_PATH}) + set_property(TARGET ${name} PROPERTY VS_DPI_AWARE "PerMonitor") + ENDIF() + + set_property(TARGET ${name} PROPERTY FOLDER "ULRE/Example/Vulkan/Texture") +endmacro() + +CreateProject(05_texture_format texture_format_list.cpp) +CreateProject(06_texture_quad texture_quad.cpp) +CreateProject(07_texture_rect texture_rect.cpp) +CreateProject(08_texture_rect_array texture_rect_array.cpp) diff --git a/example/Vulkan/TextureFormat.cpp b/example/Texture/texture_format_list.cpp similarity index 100% rename from example/Vulkan/TextureFormat.cpp rename to example/Texture/texture_format_list.cpp diff --git a/example/Vulkan/texture_quad.cpp b/example/Texture/texture_quad.cpp similarity index 98% rename from example/Vulkan/texture_quad.cpp rename to example/Texture/texture_quad.cpp index 13ce0489..3705961c 100644 --- a/example/Vulkan/texture_quad.cpp +++ b/example/Texture/texture_quad.cpp @@ -1,5 +1,4 @@ -// texture quad -// 画一个带纹理的四边形 +// 画一个带纹理的四边形 #include"VulkanAppFramework.h" #include diff --git a/example/Vulkan/texture_rect.cpp b/example/Texture/texture_rect.cpp similarity index 98% rename from example/Vulkan/texture_rect.cpp rename to example/Texture/texture_rect.cpp index b7ad107b..0a4c23f9 100644 --- a/example/Vulkan/texture_rect.cpp +++ b/example/Texture/texture_rect.cpp @@ -1,5 +1,4 @@ -// texture rect -// 画一个带纹理的矩形，2D模式专用 +// 画一个带纹理的矩形，2D模式专用 #include"VulkanAppFramework.h" #include diff --git a/example/Vulkan/texture_rect_array.cpp b/example/Texture/texture_rect_array.cpp similarity index 98% rename from example/Vulkan/texture_rect_array.cpp rename to example/Texture/texture_rect_array.cpp index 0c409f7b..6bdee495 100644 --- a/example/Vulkan/texture_rect_array.cpp +++ b/example/Texture/texture_rect_array.cpp @@ -1,5 +1,4 @@ -// texture rect -// 画一个带纹理的矩形，2D模式专用 +// 画一个带纹理的矩形，2D模式专用 #include"VulkanAppFramework.h" #include diff --git a/example/Vulkan/CMakeLists.txt b/example/Vulkan/CMakeLists.txt index 57e24876..d2548631 100644 --- a/example/Vulkan/CMakeLists.txt +++ b/example/Vulkan/CMakeLists.txt @@ -10,18 +10,8 @@ set_property(TARGET ${name} PROPERTY FOLDER "ULRE/Example/Vulkan/${group}") endmacro() -CreateProject("Basic" 01_draw_triangle_in_NDC first_triangle.cpp) -CreateProject("Basic" 02_draw_triangle_use_UBO second_triangle.cpp) -CreateProject("Basic" 03_auto_instance third_triangle.cpp) -CreateProject("Basic" 04_auto_merge_material_instance fourth_triangle.cpp) - #CreateProject("Basic" FragCoord FragCoordTest.cpp) -CreateProject("Texture" 05_texture_format TextureFormat.cpp) -CreateProject("Texture" 06_texture_quad texture_quad.cpp) -CreateProject("Texture" 07_texture_rect texture_rect.cpp) -CreateProject("Texture" 08_texture_rect_array texture_rect_array.cpp) - #CreateProject("Texture" HQFilterTexture HQFilterTexture.cpp) #CreateProject(06.Geometry2D Geometry2D.cpp)