From 4cf9f4fd5dcfae46e69f72d96b85003e8e4c5c47 Mon Sep 17 00:00:00 2001 From: Gareth Morgan Date: Mon, 30 Mar 2020 08:54:35 -0400 Subject: [PATCH] Look for filenames using alternative slash characters --- src/fbx/Fbx2Raw.cpp | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/fbx/Fbx2Raw.cpp b/src/fbx/Fbx2Raw.cpp index 1cc61a1..0815cdb 100644 --- a/src/fbx/Fbx2Raw.cpp +++ b/src/fbx/Fbx2Raw.cpp @@ -32,6 +32,14 @@ #include "materials/RoughnessMetallicMaterials.hpp" #include "materials/TraditionalMaterials.hpp" +#ifdef _WIN32 +#define SLASH_CHAR '\\' +#define ALTERNATIVE_SLASH_CHAR '/' +#else +#define SLASH_CHAR '/' +#define ALTERNATIVE_SLASH_CHAR '\\' +#endif + float scaleFactor; static std::string NativeToUTF8(const std::string& str) { @@ -998,6 +1006,21 @@ static std::string FindFbxTexture( return FileUtils::GetAbsolutePath(fileLocation); } } + // Replace slashes with alternative platform version (e.g. '/' instead of '\\') + std::string textureFileNameAltSlash = textureFileName; + std::replace( + textureFileNameAltSlash.begin(), + textureFileNameAltSlash.end(), + ALTERNATIVE_SLASH_CHAR, + SLASH_CHAR); + // finally look with alternative slashes + for (int ii = 0; ii < folders.size(); ii++) { + const auto& fileLocation = + FindFileLoosely(textureFileNameAltSlash, folders[ii], folderContents[ii]); + if (!fileLocation.empty()) { + return FileUtils::GetAbsolutePath(fileLocation); + } + } return ""; }