[*] Small fixes

Author: IAmNotHanni

include/inexor/vulkan-renderer/gltf2/gltf2_model.hpp

@@ -35,19 +35,11 @@ struct ModelPrimitive {
 struct ModelScene {
     std::vector<ModelVertex> vertices;
     std::vector<uint32_t> indices;
-
-    [[nodiscard]] auto get_vertices() const noexcept {
-        return vertices;
-    }
-
-    [[nodiscard]] auto get_indices() const noexcept {
-        return indices;
-    }
 };
 
 /// @brief A struct for glTF2 model nodes.
 struct ModelNode {
-    ModelNode *parent = nullptr;
+    ModelNode *parent{nullptr};
     std::vector<ModelNode> children;
     std::vector<ModelPrimitive> mesh;
     glm::mat4 matrix{};
@@ -60,7 +52,6 @@ class Model {
 private:
     const tinygltf::Model &m_model;
     const wrapper::Device &m_device;
-    const std::string m_file_name;
 
     std::vector<wrapper::GpuTexture> m_textures;
     std::vector<std::uint32_t> m_texture_indices;
@@ -84,6 +75,7 @@ class Model {
     // TODO: load animation skins
     // TODO: load pbr (physically based rendering) settings
     // TODO: load multiple texture coordinate sets
+    // TODO: try to .reserve() memory for vectors and use emplace_back()
 
 public:
     /// @brief Extract the model data from a model file.

src/vulkan-renderer/gltf2/gltf2_model.cpp

@@ -37,9 +37,11 @@ void Model::load_textures() {
             // The pointer to the rgb data we read from.
             unsigned char *mem_source_rgb = &texture.image[0];
 
-            for (size_t i = 0; i < texture.width * texture.height; ++i) {
+            for (std::size_t i = 0; i < texture.width * texture.height; ++i) {
                 std::memcpy(mem_target_rgba, mem_source_rgb, sizeof(unsigned char) * 3);
+                // TODO: Remove pointer arithmetic or add NOLINT
                 mem_target_rgba += 4;
+                // TODO: Remove pointer arithmetic or add NOLINT
                 mem_source_rgb += 3;
             }
 
@@ -49,7 +51,7 @@ void Model::load_textures() {
             m_textures.emplace_back(m_device, &texture.image[0], texture_size, texture.width, texture.height,
                                     texture.component, 1, "glTF2 model texture");
         } else {
-            spdlog::error("Can't load texture from model file {}", m_file_name);
+            spdlog::error("Can't load texture with {} channels!", texture.component);
 
             // Generate an error texture (checkboard pattern of pink and black squares).
             m_textures.emplace_back(m_device, wrapper::CpuTexture());
@@ -157,10 +159,13 @@ void Model::load_node(const tinygltf::Node &start_node, ModelNode *parent, std::
             }
 
             // Append data to model's vertex buffer
-            for (size_t vertex_number = 0; vertex_number < vertex_count; vertex_number++) {
+            for (std::size_t vertex_number = 0; vertex_number < vertex_count; vertex_number++) {
                 ModelVertex new_vertex{};
+                // TODO: Remove pointer arithmetic or add NOLINT
                 new_vertex.pos = glm::vec4(glm::make_vec3(&position_buffer[vertex_number * 3]), 1.0f);
+                // TODO: Remove pointer arithmetic or add NOLINT
                 new_vertex.normal = glm::normalize(glm::vec3(
+                    // TODO: Remove pointer arithmetic or add NOLINT
                     normals_buffer != nullptr ? glm::make_vec3(&normals_buffer[vertex_number * 3]) : glm::vec3(0.0f)));
                 new_vertex.uv = texture_coordinate_buffer != nullptr
                                     ? glm::make_vec2(&texture_coordinate_buffer[vertex_number * 2])
@@ -215,8 +220,8 @@ void Model::load_node(const tinygltf::Node &start_node, ModelNode *parent, std::
                 break;
             }
             default:
-                spdlog::error("Index component type {} not supported!", accessor.componentType);
-                return;
+                // TODO: Is this worth an exception or not?
+                spdlog::error("Index component type {} is not supported!", accessor.componentType);
             }
 
             ModelPrimitive new_primitive{};
@@ -244,11 +249,8 @@ void Model::load_nodes() {
 
     for (const auto &scene : m_model.scenes) {
         for (const auto &node : scene.nodes) {
-            auto vertices = m_scenes[scene_index].get_vertices();
-            auto indices = m_scenes[scene_index].get_indices();
-            load_node(m_model.nodes[node], nullptr, vertices, indices);
+            load_node(m_model.nodes[node], nullptr, m_scenes[scene_index].vertices, m_scenes[scene_index].indices);
         }
-
         scene_index++;
     }
 }