diff --git a/engine/src/loader/models/ModelUploader.cpp b/engine/src/loader/models/ModelUploader.cpp index 2232dd5..27b5c93 100644 --- a/engine/src/loader/models/ModelUploader.cpp +++ b/engine/src/loader/models/ModelUploader.cpp @@ -5,6 +5,8 @@ #include "ModelUploader.h" #include +#include +#include #include "Material.h" #include "loader/textures/TextureUploader.h" @@ -58,11 +60,14 @@ engine::ModelUploader::MaterialMap engine::ModelUploader::buildMaterials(const s for (const auto& raw : materials) { std::array, static_cast(TextureType::Count)> resolved; - for (const auto& [type, texName] : raw.texturePaths) { + for (const auto& [type, texFileName] : raw.texturePaths) { + auto texPath = std::filesystem::path(texFileName); + const auto& texName = texPath.replace_extension(); if (auto it = textures.find(texName); it != textures.end()) { resolved[static_cast(type)] = it->second; } else { - spdlog::warn("Textur '{}' für Material '{}' nicht gefunden", texName, raw.name); + std::cerr << texName.string() << texName.string().size() << std::endl; + spdlog::warn("Textur '{}' für Material '{}' nicht gefunden", texFileName, raw.name); } } result[raw.name] = std::make_shared(resolved, raw.shininess, raw.opacity); @@ -115,7 +120,6 @@ engine::Model engine::ModelUploader::buildCombinedByObject(const std::vector all; for (const auto& object : objects) { for (auto section : object.subModels) { - section.materialName = object.name; all.push_back(std::move(section)); } }