fixed the resource embedding bug

Author: devshgraphicsprogramming

include/nbl/builtin/common.h

@@ -19,7 +19,7 @@ namespace nbl::builtin
 
 constexpr std::string_view PathPrefix = "nbl/builtin/";
 constexpr bool hasPathPrefix(std::string_view str) { return str.find(PathPrefix) == 0ull; }
-	
+
 // if you attempt to use this without `NBL_EMBED_BUILTIN_RESOURCES_` CMake option, this will always return `{nullptr,0ull}`
 std::pair<const uint8_t*,size_t> get_resource_runtime(const std::string&);
 
@@ -28,7 +28,7 @@ std::pair<const uint8_t*,size_t> get_resource_runtime(const std::string&);
 constexpr std::string_view getBuiltinResourcesDirectoryPath()
 {
     std::string_view retval = __FILE__;
-    retval.remove_suffix(std::string_view("common.h").size());
+    retval.remove_suffix(PathPrefix.size()+std::string_view("common.h").size());
     return retval;
 }
 #endif

include/nbl/system/ISystem.h

@@ -113,14 +113,13 @@ class NBL_API2 ISystem : public core::IReferenceCounted
 
         //! Compile time resource ID
         template<nbl::core::StringLiteral Path>
-        inline core::smart_refctd_ptr<const IFile> loadBuiltinData() const
+        inline core::smart_refctd_ptr<const IFile> loadBuiltinData()
         {
         #ifdef _NBL_EMBED_BUILTIN_RESOURCES_
-
             return impl_loadEmbeddedBuiltinData(Path.value, nbl::builtin::get_resource<Path>());
         #else
             future_t<core::smart_refctd_ptr<IFile>> future;
-            createFile(future, STRING_LITERAL::value,core::bitflag(IFileBase::ECF_READ)|IFileBase::ECF_MAPPABLE);
+            createFile(future,system::path(Path.value),core::bitflag(IFileBase::ECF_READ)|IFileBase::ECF_MAPPABLE);
             return future.get();
         #endif
         }

src/nbl/system/ISystem.cpp

@@ -43,7 +43,7 @@ bool ISystem::exists(const system::path& filename, const core::bitflag<IFile::E_
             if (found.first && found.second)
                 return true;
         #else
-            if (exists(builtinResourceDirectory/filename))
+            if (exists(builtin::getBuiltinResourcesDirectoryPath()/filename,flags))
                 return true;
         #endif
     }
@@ -112,9 +112,9 @@ core::vector<system::path> ISystem::listItemsInDirectory(const system::path& p)
         #else
         err.clear();
         // check root path is prefixed with "nbl/builtin/"
-        if (p.string().find(builtinPathPrefix) == 0)
+        if (builtin::hasPathPrefix(p.string()))
         {
-            const auto subdirs = std::filesystem::recursive_directory_iterator(builtinResourceDirectory/p,err);
+            const auto subdirs = std::filesystem::recursive_directory_iterator(builtin::getBuiltinResourcesDirectoryPath()/p,err);
             if (!err)
             for (auto entry : subdirs) // there are never any archives inside builtins
                 res.push_back(entry.path());
@@ -221,7 +221,7 @@ void ISystem::createFile(future_t<core::smart_refctd_ptr<IFile>>& future, std::f
                 return;
             }
         #else
-            createFile(future,builtinResourceDirectory/filename,flags);
+            createFile(future,builtin::getBuiltinResourcesDirectoryPath()/filename,flags);
             return;
         #endif
     }