Assimp update to 5.4.2

.github/workflows/cross-platform-check.yml

@@ -9,7 +9,7 @@ on:
       - 'framework/**'
       - 'CMakeLists.txt'
   pull_request:
-  workflow_dispatch:
+  # workflow_dispatch:
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
@@ -18,7 +18,7 @@ env:
 jobs:
   linux:
     name: ${{ matrix.config.name }}, VulkanSDK ${{ matrix.vulkan-sdk }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
@@ -35,7 +35,7 @@ jobs:
           }
         # note: if a specific vulkan version (e.g. 1.1.x, or < 1.2.135) needs testing, you can add it here:
         # (not that ubuntu-latest (20.04) only supports >= v1.2.148 via apt)
-        vulkan-sdk: ["latest", "1.3.216"]
+        vulkan-sdk: ["latest", "1.3.243"]
 
     steps:
       - name: Checkout repository and submodules
@@ -49,15 +49,17 @@ jobs:
         # We'll use this as our working directory for all subsequent commands
         run: |
           # Add lunarg apt sources
+          sudo sed -i -e 's|disco|jammy|g' /etc/apt/sources.list
+          sudo apt update
           wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add -
           if [ "${{ matrix.vulkan-sdk }}" = "latest" ]; then
-            sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-focal.list https://packages.lunarg.com/vulkan/lunarg-vulkan-focal.list
+            sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-jammy.list https://packages.lunarg.com/vulkan/lunarg-vulkan-jammy.list
           else
-            sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-${{ matrix.vulkan-sdk }}-focal.list https://packages.lunarg.com/vulkan/${{ matrix.vulkan-sdk }}/lunarg-vulkan-${{ matrix.vulkan-sdk }}-focal.list
+            sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-${{ matrix.vulkan-sdk }}-jammy.list https://packages.lunarg.com/vulkan/${{ matrix.vulkan-sdk }}/lunarg-vulkan-${{ matrix.vulkan-sdk }}-jammy.list
           fi
 
           # For GCC-13
-          sudo add-apt-repository -y ppa:ubuntu-toolchain-r/ppa
+          sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
 
           # Update package lists
           sudo apt-get update -qq
@@ -116,7 +118,7 @@ jobs:
             cxx: "cl"
           }
         # note: if a specific vulkan version needs testing, you can add it here:
-        vulkan-sdk: ["latest", "1.3.216.0"]
+        vulkan-sdk: ["latest", "1.3.243.0"]
 
     steps:
       # IMPORTANT: apparently checkout@v3 pulls to ${{ github.event.repository.name }}/${{ github.event.repository.name }} instead of just ${{ github.event.repository.name }} on windows
@@ -177,7 +179,7 @@ jobs:
             cxx: "cl"
           }
         # note: if a specific vulkan version needs testing, you can add it here:
-        vulkan-sdk: ["latest", "1.3.216.0"]
+        vulkan-sdk: ["latest", "1.3.243.0"]
 
     steps:
       # IMPORTANT: apparently checkout@v3 pulls to ${{ github.event.repository.name }}/${{ github.event.repository.name }} instead of just ${{ github.event.repository.name }} on windows

auto_vk_toolkit/include/camera.hpp

@@ -48,7 +48,7 @@ namespace avk
 		float bottom_border() const { return mBottom; }
 
 		// sets the projection matrix
-		camera& set_projection_matrix(const glm::mat4& aMatrix);
+		camera& set_projection_matrix(const glm::mat4& aMatrix, avk::projection_type aProjectionType = avk::projection_type::unknown);
 		// Constructs and sets a perspective projection matrix with the given parameters
 		camera& set_perspective_projection(float aFov, float aAspect, float aNear, float aFar);
 		// Constructs and sets an orthographic projection matrix with the given parameters

auto_vk_toolkit/include/imgui_manager.hpp

@@ -25,6 +25,7 @@ namespace avk
 			, mQueue { &aQueueToSubmitTo }
 			, mUserInteractionEnabled{ true }
 			, mAlterSettingsBeforeInitialization{ std::move(aAlterSettingsBeforeInitialization) }
+			, mIncomingLayout{ layout::color_attachment_optimal }
 		{
 			if (aRenderpassToUse.has_value()) {
 				mRenderpass = std::move(aRenderpassToUse.value());
@@ -126,6 +127,24 @@ namespace avk
 		bool end_wanting_to_occupy_mouse() const {
 			return !mOccupyMouse && mOccupyMouseLastFrame;
 		}
+
+		/** Gets the image layout that imgui_manager assumes the color attachment to be in when it starts
+		 *  to render into it.
+		 *	The default value is: avk::layout::color_attachment_optimal
+		 */
+		layout::image_layout previous_image_layout() const {
+			return mIncomingLayout;
+		}
+
+		/** Sets the image layout that imgui_manager shall expect the color attachment to be in
+		 *  before starting to render into it.
+		 *	Note: This change might only have effect BEFORE imgui_manager has been initialized,
+		 *	      i.e., before its ::initialize() method has been invoked by the framework for the
+		 *		  first time. => Ensure to configure this value before starting the composition!
+		 */
+		void set_previous_image_layout(layout::image_layout aIncomingLayout) {
+			mIncomingLayout = aIncomingLayout;
+		}
 	private:
 		void upload_fonts();
 		void construct_render_pass();
@@ -156,6 +175,7 @@ namespace avk
 		// customization
 		std::function<void(float)> mAlterSettingsBeforeInitialization = {};
 		std::string mCustomTtfFont = {};
+		layout::image_layout mIncomingLayout;
 	};
 
 }

auto_vk_toolkit/include/model.hpp

@@ -381,6 +381,19 @@ namespace avk
 		 *	@param	aMeshIndices				Vector of mesh indices to meshes which shall be included in the animation.
 		 */
 		animation prepare_animation(uint32_t aAnimationIndex, const std::vector<mesh_index_t>& aMeshIndices);
+
+		/** Calculates the tangent space with Auto-Vk-Toolkit's implementation,
+		 *  possibly overwriting ASSIMPs tangents/bitangents.
+		 *	@param	aMeshIndex			Mesh which the tangent space shall be computed for
+		 *	@param	aConfigSourceUV		The set of UV coordinates to be used for tangent space calculation
+		 */
+		void calculate_tangent_space_for_mesh(mesh_index_t aMeshIndex, uint32_t aConfigSourceUV = 0);
+
+		/** Calculates the tangent space with Auto-Vk-Toolkit's implementation for all meshes,
+		 *  possibly overwriting ASSIMPs tangents/bitangents.
+		 *	@param	aConfigSourceUV		The set of UV coordinates to be used for tangent space calculation
+		 */
+		void calculate_tangent_space_for_all_meshes(uint32_t aConfigSourceUV = 0);
 
 	private:
 		void initialize_materials();
@@ -418,6 +431,7 @@ namespace avk
 		std::string mModelPath;
 		const aiScene* mScene;
 		std::vector<std::optional<material_config>> mMaterialConfigPerMesh;
+		std::unordered_map<mesh_index_t, std::tuple<std::vector<glm::vec3>, std::vector<glm::vec3>>> mTangentsAndBitangents;
 	};
 
 	using model = avk::owning_resource<model_t>;

auto_vk_toolkit/src/camera.cpp

@@ -16,9 +16,9 @@ namespace avk
 		, mBottom{ 0 }
 	{}
 
-    camera& camera::set_projection_matrix(const glm::mat4& aMatrix)
+    camera& camera::set_projection_matrix(const glm::mat4& aMatrix, avk::projection_type aProjectionType)
 	{
-		mProjectionType = projection_type::unknown;
+		mProjectionType = aProjectionType;
 		mProjectionMatrix = aMatrix;
 		return *this;
 	}

auto_vk_toolkit/src/context_vulkan.cpp

@@ -99,7 +99,9 @@ namespace avk
 	void context_vulkan::check_vk_result(VkResult err)
 	{
 		const auto& inst = context().vulkan_instance();
-#if VK_HEADER_VERSION >= 216
+#if VK_HEADER_VERSION >= 290
+		vk::detail::createResultValueType(static_cast<vk::Result>(err), "check_vk_result");
+#elif VK_HEADER_VERSION >= 216
 		vk::createResultValueType(static_cast<vk::Result>(err), "check_vk_result");
 #else
 		createResultValue(static_cast<vk::Result>(err), inst, "check_vk_result");

auto_vk_toolkit/src/imgui_manager.cpp

@@ -522,7 +522,7 @@ namespace avk
 
 		auto* wnd = context().main_window();
 		std::vector<attachment> attachments;
-		attachments.push_back(attachment::declare(format_from_window_color_buffer(wnd), on_load::load, usage::color(0), on_store::store.in_layout(layout::present_src)));
+		attachments.push_back(attachment::declare(format_from_window_color_buffer(wnd), on_load::load.from_previous_layout(mIncomingLayout), usage::color(0), on_store::store.in_layout(layout::present_src)));
 		for (auto a : wnd->get_additional_back_buffer_attachments()) {
 			// Well... who would have guessed the following (and, who understands??):
 			//
@@ -544,13 +544,13 @@ namespace avk
 				subpass_dependency(
 					subpass::external >> subpass::index(0),
 					// ... we have to synchronize all these stages with color+dept_stencil write access:
-					stage::color_attachment_output | stage::early_fragment_tests | stage::late_fragment_tests >> stage::color_attachment_output | stage::early_fragment_tests | stage::late_fragment_tests,
-					access::color_attachment_write | access::depth_stencil_attachment_write >> access::color_attachment_read | access::depth_stencil_attachment_write
+					stage::color_attachment_output   >>   stage::color_attachment_output,
+					access::none                     >>   access::color_attachment_read | access::color_attachment_write // read && write due to layout transition
 				),
 				subpass_dependency(
 					subpass::index(0) >> subpass::external,
-					stage::color_attachment_output >> stage::none, // assume semaphore afterwards
-					access::color_attachment_write >> access::none
+					stage::color_attachment_output   >>   stage::color_attachment_output,  // assume semaphore afterwards
+					access::color_attachment_write   >>   access::none                     //  ^ ...but still, gotta synchronize image layout transition with subsequent presentKHR :ohgodwhy:
 				)
 			}
 		);
@@ -562,13 +562,13 @@ namespace avk
 			, {
 				subpass_dependency(
 					subpass::external >> subpass::index(0),
-					stage::none >> stage::color_attachment_output,
-					access::none >> access::color_attachment_read | access::color_attachment_write
+					stage::color_attachment_output   >>   stage::color_attachment_output,
+					access::none                     >>   access::color_attachment_read | access::color_attachment_write // read && write due to layout transition
 				),
 				subpass_dependency(
 					subpass::index(0) >> subpass::external,
-					stage::color_attachment_output >> stage::none, // assume semaphore afterwards
-					access::color_attachment_write >> access::none
+					stage::color_attachment_output >> stage::color_attachment_output,  // assume semaphore afterwards
+					access::color_attachment_write >> access::none                     //  ^ ...but still, gotta synchronize image layout transition with subsequent presentKHR :ohgodwhy:
 				)
 			}
 		);