GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

code review changes and fixes

Browse Source
This commit is contained in:
ohyzha
2024-08-02 15:27:36 +03:00
parent e69a553b18
commit be549dccf6
18 changed files with 86 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
openVulkanoCpp/Host/Linux/ResourceLoaderAppDirLinux.cpp
View File

@@ -40,8 +40,9 @@ namespace OpenVulkano
}
}
Array<char> ResourceLoaderAppDirLinux::GetResource(const std::string& resourceName)
Array<char> ResourceLoaderAppDirLinux::GetResource(const std::string& resourceName, std::string& resourcePath)
{
return Utils::ReadFile(GetAppDir() + resourceName, true);
resourcePath = GetAppDir() + resourceName;
return Utils::ReadFile(resourcePath, true);
}
}

2
openVulkanoCpp/Host/Linux/ResourceLoaderAppDirLinux.hpp
View File

@@ -13,6 +13,6 @@ namespace OpenVulkano
class ResourceLoaderAppDirLinux final : public ResourceLoader
{
public:
Array<char> GetResource(const std::string& resourceName) override;
Array<char> GetResource(const std::string& resourceName, std::string& resourcePath) override;
};
}

4
openVulkanoCpp/Host/ResourceLoader.cpp
View File

@@ -15,13 +15,13 @@ namespace OpenVulkano
std::vector<std::unique_ptr<ResourceLoader>> m_loaders;
public:
Array<char> GetResource(const std::string& resourceName) override
Array<char> GetResource(const std::string& resourceName, std::string& resourcePath) override
{
for(auto& loader : m_loaders)
{
try
{
auto res = loader->GetResource(resourceName);
auto res = loader->GetResource(resourceName, resourcePath);
if (!res.Empty()) return res;
}
catch (const std::exception& e)

2
openVulkanoCpp/Host/ResourceLoader.hpp
View File

@@ -15,7 +15,7 @@ namespace OpenVulkano
public:
virtual ~ResourceLoader() = default;
virtual Array<char> GetResource(const std::string& resourceName) = 0;
virtual Array<char> GetResource(const std::string& resourceName, std::string& resourcePath) = 0;
static ResourceLoader& GetInstance();

3
openVulkanoCpp/Host/WebResourceLoader.cpp
View File

@@ -90,11 +90,12 @@ namespace OpenVulkano
return Array<char>(buffer);
}
Array<char> WebResourceLoader::GetResource(const std::string& resourceName)
Array<char> WebResourceLoader::GetResource(const std::string& resourceName, std::string& resourcePath)
{
if (IsUrl(resourceName))
{
std::filesystem::path cacheFilePath = GetCacheFilePath(resourceName);
resourcePath = resourceName;
if (std::filesystem::exists(cacheFilePath)) { return Utils::ReadFile(cacheFilePath.string()); }
else { return DownloadResource(resourceName); }
}

2
openVulkanoCpp/Host/WebResourceLoader.hpp
View File

@@ -24,6 +24,6 @@ namespace OpenVulkano
WebResourceLoader();
~WebResourceLoader();
Array<char> GetResource(const std::string& resourceName) override;
Array<char> GetResource(const std::string& resourceName, std::string& resourcePath) override;
};
}

5
openVulkanoCpp/Host/Windows/ResourceLoaderAppDirWindows.cpp
View File

@@ -38,8 +38,9 @@ namespace OpenVulkano
}
}
Array<char> ResourceLoaderAppDirWindows::GetResource(const std::string& resourceName)
Array<char> ResourceLoaderAppDirWindows::GetResource(const std::string& resourceName, std::string& resourcePath)
{
return Utils::ReadFile(GetAppDir() + resourceName);
resourcePath = GetAppDir() + resourceName;
return Utils::ReadFile(resourcePath);
}
}

2
openVulkanoCpp/Host/Windows/ResourceLoaderAppDirWindows.hpp
View File

@@ -13,6 +13,6 @@ namespace OpenVulkano
class ResourceLoaderAppDirWindows final : public ResourceLoader
{
public:
Array<char> GetResource(const std::string& resourceName) override;
Array<char> GetResource(const std::string& resourceName, std::string& resourcePath) override;
};
}