refactor module

Author: Mysvac

docs/codes/04/00_cxxmodule/module_code.zip

@@ -179,17 +179,8 @@ Intel(R) UHD Graphics ...
 
 最终代码：[下载](../../codes/04/00_cxxmodule/vk_module_demo.zip)
 
-## **相关库的模块化**
-
-1. GLFW : **[这里](https://github.com/Mysvac/glfw_cpp_module)**
-2. GLM : TODO
-3. stb_image : TODO
-4. tinyobjloader : TODO
-
 ## **项目模块化示例**
 
-**此小节待重构！！**
-
 请下载下面的示例代码，此代码将“移动摄像机”的代码进行了模块化拆分，使得结构更加清晰：
 
 **[点击下载](../../codes/04/00_cxxmodule/module_code.zip)**
@@ -200,6 +191,10 @@ Intel(R) UHD Graphics ...
 
 这有助于你了解 Vulkan 各组件的依赖关系，因为它们现在严格分离在多个模块文件中，而不像之前一样挤在一起。
 
+## **其他库的模块化**
+
+参考上一部分 **[项目模块化示例代码](../../codes/04/00_cxxmodule/module_code.zip)** ，在 `src/third` 中为你提供了其他四个库的模块接口文件。
+
 ---
 
 第一部分：

docs/md/04/00_cxxmodule.md

@@ -5,13 +5,10 @@ find_package(Vulkan REQUIRED)
 set(SHADER_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 set(STAGE_VERT "-fshader-stage=vert")
 set(STAGE_FRAG "-fshader-stage=frag")
-set(STAGE_COMP "-fshader-stage=comp")
 set(GRAPHICS_VERT_SHADER ${SHADER_DIR}/graphics.vert.glsl)
 set(GRAPHICS_FRAG_SHADER ${SHADER_DIR}/graphics.frag.glsl)
-set(COMPUTE_COMP_SHADER ${SHADER_DIR}/compute.comp.glsl)
 set(GRAPHICS_SPIRV_VERT ${SHADER_DIR}/graphics.vert.spv)
 set(GRAPHICS_SPIRV_FRAG ${SHADER_DIR}/graphics.frag.spv)
-set(COMPUTE_SPIRV_COMP ${SHADER_DIR}/compute.comp.spv)
 
 add_custom_command(
         OUTPUT ${GRAPHICS_SPIRV_VERT}
@@ -27,13 +24,7 @@ add_custom_command(
         DEPENDS ${GRAPHICS_FRAG_SHADER}
 )
 
-add_custom_command(
-        OUTPUT ${COMPUTE_SPIRV_COMP}
-        COMMAND ${Vulkan_GLSLC_EXECUTABLE} ${STAGE_COMP} ${COMPUTE_COMP_SHADER} -o ${COMPUTE_SPIRV_COMP}
-        COMMENT "Compiling compute.comp.glsl to compute.comp.spv"
-        DEPENDS ${COMPUTE_COMP_SHADER}
-)
 
 add_custom_target(CompileShaders ALL
-        DEPENDS ${GRAPHICS_SPIRV_VERT} ${GRAPHICS_SPIRV_FRAG} ${COMPUTE_SPIRV_COMP}
+        DEPENDS ${GRAPHICS_SPIRV_VERT} ${GRAPHICS_SPIRV_FRAG}
 )

shaders/CMakeLists.txt

@@ -1,11 +1,11 @@
 #version 450
 
-layout(location = 0) in vec3 fragColor;
+layout(set = 1, binding = 0) uniform sampler2D texSampler;
+
+layout(location = 0) in vec2 fragTexCoord;
 
 layout(location = 0) out vec4 outColor;
 
 void main() {
-
-    vec2 coord = gl_PointCoord - vec2(0.5);
-    outColor = vec4(fragColor, 0.5 - length(coord));
+    outColor = texture(texSampler, fragTexCoord);
 }

shaders/graphics.frag.glsl

@@ -1,12 +1,17 @@
 #version 450
 
-layout(location = 0) in vec2 inPosition;
-layout(location = 1) in vec4 inColor;
+layout(binding = 0) uniform UniformBufferObject {
+    mat4 model;
+    mat4 view;
+    mat4 proj;
+} ubo;
 
-layout(location = 0) out vec3 fragColor;
+layout(location = 0) in vec3 inPosition;
+layout(location = 1) in vec2 inTexCoord;
+
+layout(location = 0) out vec2 fragTexCoord;
 
 void main() {
-    gl_PointSize = 14.0;
-    gl_Position = vec4(inPosition.xy, 1.0, 1.0);
-    fragColor = inColor.rgb;
+    gl_Position = ubo.proj * ubo.view * ubo.model * vec4(inPosition, 1.0);
+    fragTexCoord = inTexCoord;
 }

shaders/graphics.vert.glsl

@@ -1,47 +1,15 @@
 import std;
-import glfw;
 import vulkan_hpp;
+import App;
 
 int main() {
-    const vk::raii::Context context{};
-
-    // Initialize GLFW and create a window
-    glfw::init();
-    glfw::window_hint(glfw::CLIENT_API, glfw::NO_API);
-    glfw::window_hint(glfw::RESIZABLE, glfw::FALSE);
-    glfw::Window* window = glfw::create_window(800, 600, "Vulkan", nullptr, nullptr);
-
-    // get the required Vulkan extensions for GLFW
-    unsigned int count = 0;
-    const char ** extensions = glfw::get_required_instance_extensions(&count);
-    std::vector<const char*> extension_list(extensions, extensions + count);
-
-    // create a Vulkan instance
-    constexpr vk::ApplicationInfo appInfo{
-        "Vulkan GLFW Example", 1,
-        "No Engine",1 ,
-        vk::makeApiVersion(1,4,0,0)
-    };
-    vk::InstanceCreateInfo create_info{{}, &appInfo, };
-    create_info.setPEnabledExtensionNames(extension_list);
-
-    const vk::raii::Instance instance{context, create_info};
-
-    // create a Vulkan surface from the GLFW window
-    glfw::VkSurfaceKHR c_surface{};
-    if (static_cast<vk::Result>(glfw::create_window_surface(*instance, window, nullptr, &c_surface)) != vk::Result::eSuccess) {
-        std::println(std::cerr << "Failed to create window surface!");
-        return -1;
-    }
-    vk::raii::SurfaceKHR surface{ instance, c_surface };
-    std::println("Vulkan window surface created successfully!");
-
-    // wait for the window to close
-    while (!glfw::window_should_close(window)) {
-        glfw::poll_events();
+    try {
+        vht::App app{};
+        app.run();
+    } catch (const vk::SystemError& e) {
+        std::cerr << e.code().message() << std::endl;
+        std::cerr << e.what() << std::endl;
+    } catch (const std::exception& e) {
+        std::cerr << e.what() << std::endl;
     }
-
-    // clean up
-    glfw::destroy_window(window);
-    glfw::terminate();
 }