Merge branch 'main' into address-resize-issue-73

Author: gpx1000

.gitignore

@@ -9,4 +9,12 @@ temp_ebook.md
 ebook/*.pdf
 ebook/*.epub
 
-convert.py
+convert.py
+
+attachments/build/**
+attachments/android/.gradle/**
+attachments/android/.idea
+attachments/android/.gradle/**
+attachments/android/app/.cxx/**
+attachments/android/app/build/**
+local.properties

antora/modules/ROOT/nav.adoc

@@ -52,4 +52,13 @@
 * xref:15_GLTF_KTX2_Migration.adoc[Migrating to Modern Asset Formats: glTF and KTX2]
 * xref:16_Multiple_Objects.adoc[Rendering Multiple Objects]
 * xref:17_Multithreading.adoc[Multithreading]
+* xref:courses/18_Ray_tracing/00_Overview.adoc[Ray Tracing]
+** xref:courses/18_Ray_tracing/00_Overview.adoc[Overview]
+** xref:courses/18_Ray_tracing/01_Dynamic_rendering.adoc[Dynamic rendering]
+** xref:courses/18_Ray_tracing/02_Acceleration_structures.adoc[Acceleration structures]
+** xref:courses/18_Ray_tracing/03_Ray_query_shadows.adoc[Ray query shadows]
+** xref:courses/18_Ray_tracing/04_TLAS_animation.adoc[TLAS animation]
+** xref:courses/18_Ray_tracing/05_Shadow_transparency.adoc[Shadow transparency]
+** xref:courses/18_Ray_tracing/06_Reflections.adoc[Reflections]
+** xref:courses/18_Ray_tracing/07_Conclusion.adoc[Conclusion]
 * xref:90_FAQ.adoc[FAQ]

attachments/00_base_code.cpp

@@ -1,5 +1,5 @@
 #include <memory>
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;

attachments/01_instance_creation.cpp

@@ -4,7 +4,7 @@
 #include <cstdlib>
 #include <memory>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;

attachments/02_validation_layers.cpp

@@ -6,7 +6,7 @@
 #include <memory>
 #include <algorithm>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;

attachments/03_physical_device_selection.cpp

@@ -6,7 +6,7 @@
 #include <memory>
 #include <algorithm>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;

attachments/04_logical_device.cpp

@@ -7,7 +7,7 @@
 #include <memory>
 #include <algorithm>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;

attachments/05_window_surface.cpp

@@ -6,7 +6,7 @@
 #include <memory>
 #include <algorithm>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;

attachments/06_swap_chain_creation.cpp

@@ -8,7 +8,7 @@
 #include <algorithm>
 #include <limits>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;

attachments/07_image_views.cpp

@@ -8,7 +8,7 @@
 #include <limits>
 #include <assert.h>
 
-#ifdef __INTELLISENSE__
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
 #include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
@@ -267,7 +267,7 @@ class HelloTriangleApplication {
     }
 
     void createImageViews() {
-        swapChainImageViews.clear();
+        assert(swapChainImageViews.empty());
 
         vk::ImageViewCreateInfo imageViewCreateInfo{ .viewType = vk::ImageViewType::e2D, .format = swapChainSurfaceFormat.format,
           .subresourceRange = { vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1 } };