engine3d-dev · SpinnerX · Dec 20, 2025 · Dec 20, 2025 · Dec 20, 2025 · Dec 20, 2025
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,20 +2,19 @@ cmake_minimum_required(VERSION 3.27)
 project(vulkan-cpp CXX)
 
 build_library(
-    DIRECTORIES
-    src
-    # demos/1-instance
-    # demos/2-physical-device
-    # demos/3-logical-device
-    # demos/4-surface
-    # demos/5-swapchain
-    # demos/6-graphics-pipeline
-    # demos/7-vertex-buffer
-    # demos/8-index-uniform-buffers
-    # demos/9-uniforms
-    # demos/10-textures
-    # demos/11-depth-buffering
-    # demos/12-loading-models
+    DIRECTORIES vulkan-cpp/
+    demos/1-instance
+    demos/2-physical-device
+    demos/3-logical-device
+    demos/4-surface
+    demos/5-swapchain
+    demos/6-graphics-pipeline
+    demos/7-vertex-buffer
+    demos/8-index-uniform-buffers
+    demos/9-uniforms
+    demos/10-textures
+    demos/11-depth-buffering
+    demos/12-loading-models
     # demos/13-skybox
     # demos/sandbox
     ENABLE_TESTS OFF
@@ -37,6 +36,35 @@ build_library(
     tinyobjloader::tinyobjloader
 )
 
-generate_compile_commands()
+target_sources(${PROJECT_NAME} PUBLIC
+    FILE_SET CXX_MODULES
+    TYPE CXX_MODULES
+    FILES
+    vulkan-cpp/vk.cppm
+    vulkan-cpp/types.cppm
+    vulkan-cpp/utilities.cppm
+    vulkan-cpp/instance.cppm
+    vulkan-cpp/physical_device.cppm
+    vulkan-cpp/device.cppm
+    vulkan-cpp/device_queue.cppm
+    vulkan-cpp/surface.cppm
+    vulkan-cpp/swapchain.cppm
+    vulkan-cpp/device_present_queue.cppm
+    vulkan-cpp/command_buffer.cppm
+    vulkan-cpp/renderpass.cppm
+    vulkan-cpp/framebuffer.cppm
+    vulkan-cpp/sample_image.cppm
+    vulkan-cpp/shader_resource.cppm
+    vulkan-cpp/pipeline.cppm
+    vulkan-cpp/buffer_streams.cppm
+    vulkan-cpp/vertex_buffer.cppm
+    vulkan-cpp/buffer_streams16.cppm
+    vulkan-cpp/buffer_streams32.cppm
+    vulkan-cpp/index_buffer.cppm
+    vulkan-cpp/uniform_buffer.cppm
+    vulkan-cpp/descriptor_resource.cppm
+    vulkan-cpp/texture.cppm
+)
 
 target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+target_include_directories(${PROJECT_NAME} PUBLIC ./)
diff --git a/conanfile.py b/conanfile.py
@@ -1,28 +1,24 @@
 import os
 from conan import ConanFile
 from conan.tools.cmake import CMakeToolchain, CMake, cmake_layout, CMakeDeps
-from conan.tools.system.package_manager import Apt, Yum, PacMan, Zypper
-from conan.tools.scm import Git
 from conan.tools.files import copy
 import os
 
 class VulkanCpp(ConanFile):
     name = "vulkan-cpp"
-    version = "3.0"
+    version = "4.0"
     settings = "os", "compiler", "build_type", "arch"
-    generators = "CMakeDeps", "CMakeToolchain"
 
-    # Putting all of your build-related dependencies here
     def build_requirements(self):
-        self.tool_requires("make/4.4.1")
-        self.tool_requires("cmake/3.27.1")
+        self.tool_requires("cmake/4.1.2")
+        self.tool_requires("ninja/1.13.1")
         self.tool_requires("engine3d-cmake-utils/4.0")
+        self.tool_requires("cmake-modules-toolchain/1.0.3")
 
-    # Putting all of your packages here
     def requirements(self):
         self.requires("glfw/3.4")
         self.requires("vulkan-headers/1.3.290.0")
-        self.requires("imguidocking/2.0")
+        # self.requires("imguidocking/2.0")
         self.requires("glm/1.0.1")
         self.requires("stb/cci.20230920")
         self.requires("tinyobjloader/2.0.0-rc10")
@@ -35,6 +31,12 @@ def export_sources(self):
         copy(self,"*.hpp", self.recipe_folder, self.export_sources_folder)
         copy(self,"*.cpp", self.recipe_folder, self.export_sources_folder)
 
+    def generate(self):
+        deps = CMakeDeps(self)
+        deps.generate()
+        tc = CMakeToolchain(self)
+        tc.generate()
+
     def build(self):
         cmake = CMake(self)
         cmake.configure()

diff --git a/demos/1-instance/application.cpp b/demos/1-instance/application.cpp
@@ -1,9 +1,20 @@
-#define FMT_HEADER_ONLY
-#include <fmt/format.h>
+#define GLFW_INCLUDE_VULKAN
+#if _WIN32
+#define VK_USE_PLATFORM_WIN32_KHR
 #include <GLFW/glfw3.h>
-#include <vulkan-cpp/instance.hpp>
+#define GLFW_EXPOSE_NATIVE_WIN32
+#include <GLFW/glfw3native.h>
+#include <vulkan/vulkan.h>
+#else
+#include <GLFW/glfw3.h>
+#include <vulkan/vulkan.h>
+#endif
+
 #include <array>
 #include <print>
+#include <span>
+import vk;
+
 
 static VKAPI_ATTR VkBool32 VKAPI_CALL
 debug_callback(
@@ -55,7 +66,7 @@ int
 main() {
     //! @note Just added the some test code to test the conan-starter setup code
     if (!glfwInit()) {
-        fmt::print("glfwInit could not be initialized!\n");
+        std::print("glfwInit could not be initialized!\n");
         return -1;
     }
 

diff --git a/demos/10-textures/application.cpp b/demos/10-textures/application.cpp
@@ -1,29 +1,20 @@
+#define GLFW_INCLUDE_VULKAN
+#if _WIN32
+#define VK_USE_PLATFORM_WIN32_KHR
+#include <GLFW/glfw3.h>
+#define GLFW_EXPOSE_NATIVE_WIN32
+#include <GLFW/glfw3native.h>
+#include <vulkan/vulkan.h>
+#else
+#include <GLFW/glfw3.h>
+#include <vulkan/vulkan.h>
+#endif
+
 #include <array>
 #include <print>
-
-// This is required to select the correct extension for specific platform
-#include <vulkan-cpp/imports.hpp>
-
-#include <vulkan-cpp/utilities.hpp>
-#include <vulkan-cpp/instance.hpp>
-#include <vulkan-cpp/physical_device.hpp>
-#include <vulkan-cpp/device.hpp>
-#include <vulkan-cpp/device_queue.hpp>
-#include <vulkan-cpp/surface.hpp>
-#include <vulkan-cpp/swapchain.hpp>
-#include <vulkan-cpp/device_present_queue.hpp>
-#include <vulkan-cpp/command_buffer.hpp>
-#include <vulkan-cpp/renderpass.hpp>
-#include <vulkan-cpp/framebuffer.hpp>
-#include <vulkan-cpp/sample_image.hpp>
-
-#include <vulkan-cpp/shader_resource.hpp>
-#include <vulkan-cpp/pipeline.hpp>
-#include <vulkan-cpp/vertex_buffer.hpp>
-#include <vulkan-cpp/index_buffer.hpp>
-#include <vulkan-cpp/uniform_buffer.hpp>
-#include <vulkan-cpp/descriptor_resource.hpp>
-#include <vulkan-cpp/texture.hpp>
+#include <span>
+#include <filesystem>
+import vk;
 
 #include <chrono>
 #define GLM_FORCE_RADIANS

diff --git a/demos/11-depth-buffering/application.cpp b/demos/11-depth-buffering/application.cpp
@@ -1,29 +1,20 @@
+#define GLFW_INCLUDE_VULKAN
+#if _WIN32
+#define VK_USE_PLATFORM_WIN32_KHR
+#include <GLFW/glfw3.h>
+#define GLFW_EXPOSE_NATIVE_WIN32
+#include <GLFW/glfw3native.h>
+#include <vulkan/vulkan.h>
+#else
+#include <GLFW/glfw3.h>
+#include <vulkan/vulkan.h>
+#endif
+
 #include <array>
 #include <print>
-
-// This is required to select the correct extension for specific platform
-#include <vulkan-cpp/imports.hpp>
-
-#include <vulkan-cpp/utilities.hpp>
-#include <vulkan-cpp/instance.hpp>
-#include <vulkan-cpp/physical_device.hpp>
-#include <vulkan-cpp/device.hpp>
-#include <vulkan-cpp/device_queue.hpp>
-#include <vulkan-cpp/surface.hpp>
-#include <vulkan-cpp/swapchain.hpp>
-#include <vulkan-cpp/device_present_queue.hpp>
-#include <vulkan-cpp/command_buffer.hpp>
-#include <vulkan-cpp/renderpass.hpp>
-#include <vulkan-cpp/framebuffer.hpp>
-
-#include <vulkan-cpp/shader_resource.hpp>
-#include <vulkan-cpp/pipeline.hpp>
-#include <vulkan-cpp/vertex_buffer.hpp>
-#include <vulkan-cpp/index_buffer.hpp>
-#include <vulkan-cpp/uniform_buffer.hpp>
-#include <vulkan-cpp/descriptor_resource.hpp>
-#include <vulkan-cpp/texture.hpp>
-#include <vulkan-cpp/sample_image.hpp>
+#include <span>
+#include <filesystem>
+import vk;
 
 #include <chrono>
 #define GLM_FORCE_RADIANS

diff --git a/demos/12-loading-models/application.cpp b/demos/12-loading-models/application.cpp
@@ -1,29 +1,20 @@
+#define GLFW_INCLUDE_VULKAN
+#if _WIN32
+#define VK_USE_PLATFORM_WIN32_KHR
+#include <GLFW/glfw3.h>
+#define GLFW_EXPOSE_NATIVE_WIN32
+#include <GLFW/glfw3native.h>
+#include <vulkan/vulkan.h>
+#else
+#include <GLFW/glfw3.h>
+#include <vulkan/vulkan.h>
+#endif
+
 #include <array>
 #include <print>
-
-// This is required to select the correct extension for specific platform
-#include <vulkan-cpp/imports.hpp>
-
-#include <vulkan-cpp/utilities.hpp>
-#include <vulkan-cpp/instance.hpp>
-#include <vulkan-cpp/physical_device.hpp>
-#include <vulkan-cpp/device.hpp>
-#include <vulkan-cpp/device_queue.hpp>
-#include <vulkan-cpp/surface.hpp>
-#include <vulkan-cpp/swapchain.hpp>
-#include <vulkan-cpp/device_present_queue.hpp>
-#include <vulkan-cpp/command_buffer.hpp>
-#include <vulkan-cpp/renderpass.hpp>
-#include <vulkan-cpp/framebuffer.hpp>
-#include <vulkan-cpp/sample_image.hpp>
-
-#include <vulkan-cpp/shader_resource.hpp>
-#include <vulkan-cpp/pipeline.hpp>
-#include <vulkan-cpp/vertex_buffer.hpp>
-#include <vulkan-cpp/index_buffer.hpp>
-#include <vulkan-cpp/uniform_buffer.hpp>
-#include <vulkan-cpp/descriptor_resource.hpp>
-#include <vulkan-cpp/texture.hpp>
+#include <span>
+#include <filesystem>
+import vk;
 
 #include <chrono>
 #define GLM_FORCE_RADIANS

diff --git a/demos/2-physical-device/application.cpp b/demos/2-physical-device/application.cpp
@@ -1,11 +1,19 @@
+#define GLFW_INCLUDE_VULKAN
+#if _WIN32
+#define VK_USE_PLATFORM_WIN32_KHR
+#include <GLFW/glfw3.h>
+#define GLFW_EXPOSE_NATIVE_WIN32
+#include <GLFW/glfw3native.h>
+#include <vulkan/vulkan.h>
+#else
+#include <GLFW/glfw3.h>
+#include <vulkan/vulkan.h>
+#endif
+
 #include <array>
 #include <print>
-
-#define FMT_HEADER_ONLY
-#include <fmt/format.h>
-#include <GLFW/glfw3.h>
-#include <vulkan-cpp/instance.hpp>
-#include <vulkan-cpp/physical_device.hpp>
+#include <span>
+import vk;
 
 static VKAPI_ATTR VkBool32 VKAPI_CALL
 debug_callback(
@@ -57,7 +65,7 @@ int
 main() {
     //! @note Just added the some test code to test the conan-starter setup code
     if (!glfwInit()) {
-        fmt::print("glfwInit could not be initialized!\n");
+        std::print("glfwInit could not be initialized!\n");
         return -1;
     }
 

diff --git a/demos/3-logical-device/application.cpp b/demos/3-logical-device/application.cpp
@@ -1,14 +1,20 @@
+#define GLFW_INCLUDE_VULKAN
+#if _WIN32
+#define VK_USE_PLATFORM_WIN32_KHR
+#include <GLFW/glfw3.h>
+#define GLFW_EXPOSE_NATIVE_WIN32
+#include <GLFW/glfw3native.h>
+#include <vulkan/vulkan.h>
+#else
+#include <GLFW/glfw3.h>
+#include <vulkan/vulkan.h>
+#endif
+
 #include <array>
 #include <print>
+#include <span>
+import vk;
 
-#define FMT_HEADER_ONLY
-#include <fmt/format.h>
-#include <GLFW/glfw3.h>
-#include <vulkan-cpp/utilities.hpp>
-#include <vulkan-cpp/instance.hpp>
-#include <vulkan-cpp/physical_device.hpp>
-#include <vulkan-cpp/device.hpp>
-#include <vulkan-cpp/device_queue.hpp>
 
 static VKAPI_ATTR VkBool32 VKAPI_CALL
 debug_callback(
@@ -60,7 +66,7 @@ int
 main() {
     //! @note Just added the some test code to test the conan-starter setup code
     if (!glfwInit()) {
-        fmt::print("glfwInit could not be initialized!\n");
+        std::print("glfwInit could not be initialized!\n");
         return -1;
     }
 

diff --git a/demos/4-surface/application.cpp b/demos/4-surface/application.cpp
@@ -1,16 +1,19 @@
+#define GLFW_INCLUDE_VULKAN
+#if _WIN32
+#define VK_USE_PLATFORM_WIN32_KHR
+#include <GLFW/glfw3.h>
+#define GLFW_EXPOSE_NATIVE_WIN32
+#include <GLFW/glfw3native.h>
+#include <vulkan/vulkan.h>
+#else
+#include <GLFW/glfw3.h>
+#include <vulkan/vulkan.h>
+#endif
+
 #include <array>
 #include <print>
-
-#include <vulkan-cpp/imports.hpp>
-
-#define FMT_HEADER_ONLY
-#include <fmt/format.h>
-#include <vulkan-cpp/utilities.hpp>
-#include <vulkan-cpp/instance.hpp>
-#include <vulkan-cpp/physical_device.hpp>
-#include <vulkan-cpp/device.hpp>
-#include <vulkan-cpp/device_queue.hpp>
-#include <vulkan-cpp/surface.hpp>
+#include <span>
+import vk;
 
 static VKAPI_ATTR VkBool32 VKAPI_CALL
 debug_callback(
@@ -62,7 +65,7 @@ int
 main() {
     //! @note Just added the some test code to test the conan-starter setup code
     if (!glfwInit()) {
-        fmt::print("glfwInit could not be initialized!\n");
+        std::print("glfwInit could not be initialized!\n");
         return -1;
     }