Improve usage of fastgltf & use fmt::print

Author: spnda

chapter-3/vk_loader.cpp

@@ -20,7 +20,8 @@ std::optional<std::vector<std::shared_ptr<MeshAsset>>> loadGltfMeshes(VulkanEngi
     data.loadFromFile(filePath);
 
     constexpr auto gltfOptions = fastgltf::Options::LoadGLBBuffers
-        | fastgltf::Options::LoadExternalBuffers;
+            | fastgltf::Options::LoadExternalBuffers
+            | fastgltf::Options::GenerateMeshIndices;
 
     fastgltf::Asset gltf;
     fastgltf::Parser parser {};
@@ -29,7 +30,7 @@ std::optional<std::vector<std::shared_ptr<MeshAsset>>> loadGltfMeshes(VulkanEngi
     if (load) {
         gltf = std::move(load.get());
     } else {
-        fmt::print("Failed to load glTF: {} \n", fastgltf::to_underlying(load.error()));
+        fmt::print("Failed to load glTF: {} \n", fastgltf::getErrorMessage(load.error()));
         return {};
     }
 //< openmesh
@@ -40,7 +41,7 @@ std::optional<std::vector<std::shared_ptr<MeshAsset>>> loadGltfMeshes(VulkanEngi
     // often
     std::vector<uint32_t> indices;
     std::vector<Vertex> vertices;
-    for (fastgltf::Mesh& mesh : gltf.meshes) {
+    for (const fastgltf::Mesh& mesh : gltf.meshes) {
         MeshAsset newmesh;
 
         newmesh.name = mesh.name;

chapter-4/vk_loader.cpp

@@ -20,7 +20,8 @@ std::optional<std::vector<std::shared_ptr<MeshAsset>>> loadGltfMeshes(VulkanEngi
     data.loadFromFile(filePath);
 
     constexpr auto gltfOptions = fastgltf::Options::LoadGLBBuffers
-        | fastgltf::Options::LoadExternalBuffers;
+            | fastgltf::Options::LoadExternalBuffers
+            | fastgltf::Options::GenerateMeshIndices;
 
     fastgltf::Asset gltf;
     fastgltf::Parser parser {};
@@ -29,7 +30,7 @@ std::optional<std::vector<std::shared_ptr<MeshAsset>>> loadGltfMeshes(VulkanEngi
     if (load) {
         gltf = std::move(load.get());
     } else {
-        fmt::print("Failed to load glTF: {} \n", fastgltf::to_underlying(load.error()));
+        fmt::print("Failed to load glTF: {} \n", fastgltf::getErrorMessage(load.error()));
         return {};
     }
 //< openmesh
@@ -40,7 +41,7 @@ std::optional<std::vector<std::shared_ptr<MeshAsset>>> loadGltfMeshes(VulkanEngi
     // often
     std::vector<uint32_t> indices;
     std::vector<Vertex> vertices;
-    for (fastgltf::Mesh& mesh : gltf.meshes) {
+    for (const fastgltf::Mesh& mesh : gltf.meshes) {
         MeshAsset newmesh;
 
         newmesh.name = mesh.name;

chapter-5/vk_loader.cpp

@@ -137,7 +137,11 @@ std::optional<std::shared_ptr<LoadedGLTF>> loadGltf(VulkanEngine* engine, std::s
 
     fastgltf::Parser parser {};
 
-    constexpr auto gltfOptions = fastgltf::Options::DontRequireValidAssetMember | fastgltf::Options::AllowDouble | fastgltf::Options::LoadGLBBuffers | fastgltf::Options::LoadExternalBuffers;
+    constexpr auto gltfOptions = fastgltf::Options::DontRequireValidAssetMember
+            | fastgltf::Options::AllowDouble
+            | fastgltf::Options::LoadGLBBuffers
+            | fastgltf::Options::LoadExternalBuffers
+            | fastgltf::Options::GenerateMeshIndices;
     // fastgltf::Options::LoadExternalImages;
 
     fastgltf::GltfDataBuffer data;
@@ -153,15 +157,15 @@ std::optional<std::shared_ptr<LoadedGLTF>> loadGltf(VulkanEngine* engine, std::s
         if (load) {
             gltf = std::move(load.get());
         } else {
-            std::cerr << "Failed to load glTF: " << fastgltf::to_underlying(load.error()) << std::endl;
+            fmt::print("Failed to load glTF: {}", fastgltf::getErrorMessage(load.error()));
             return {};
         }
     } else if (type == fastgltf::GltfType::GLB) {
         auto load = parser.loadBinaryGLTF(&data, path.parent_path(), gltfOptions);
         if (load) {
             gltf = std::move(load.get());
         } else {
-            std::cerr << "Failed to load glTF: " << fastgltf::to_underlying(load.error()) << std::endl;
+            fmt::print("Failed to load glTF: {}", fastgltf::getErrorMessage(load.error()));
             return {};
         }
     } else {
@@ -180,7 +184,7 @@ std::optional<std::shared_ptr<LoadedGLTF>> loadGltf(VulkanEngine* engine, std::s
 //> load_samplers
 
     // load samplers
-    for (fastgltf::Sampler& sampler : gltf.samplers) {
+    for (const fastgltf::Sampler& sampler : gltf.samplers) {
 
         VkSamplerCreateInfo sampl = { .sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO, .pNext = nullptr};
         sampl.maxLod = VK_LOD_CLAMP_NONE;
@@ -364,7 +368,7 @@ std::optional<std::shared_ptr<LoadedGLTF>> loadGltf(VulkanEngine* engine, std::s
 
             glm::vec3 minpos = vertices[initial_vtx].position;
             glm::vec3 maxpos = vertices[initial_vtx].position;
-            for (int i = initial_vtx; i < vertices.size(); i++) {
+            for (size_t i = initial_vtx; i < vertices.size(); i++) {
                 minpos = glm::min(minpos, vertices[i].position);
                 maxpos = glm::max(maxpos, vertices[i].position);
             }

meshbaker/main.cpp

@@ -67,7 +67,7 @@ void output_meshes(std::filesystem::path target_file, std::filesystem::path sour
 			gltf = std::move(load.get());
 		}
 		else {
-			std::cerr << "Failed to load glTF: " << fastgltf::to_underlying(load.error()) << std::endl;
+			std::cerr << "Failed to load glTF: " << fastgltf::getErrorMessage(load.error()) << std::endl;
 		}
 	}
 	else if (type == fastgltf::GltfType::GLB) {
@@ -76,7 +76,7 @@ void output_meshes(std::filesystem::path target_file, std::filesystem::path sour
 			gltf = std::move(load.get());
 		}
 		else {
-			std::cerr << "Failed to load glTF: " << fastgltf::to_underlying(load.error()) << std::endl;
+			std::cerr << "Failed to load glTF: " << fastgltf::getErrorMessage(load.error()) << std::endl;
 		}
 	}
 	else {