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

utils::ReadFile nullTerminateString addition

Browse Source
This commit is contained in:
Metehan Tuncbilek
2024-07-15 17:30:29 +03:00
parent 2584d852c8
commit 5aa84db3e2
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
openVulkanoCpp/Base/Utils.cpp
View File

@@ -61,7 +61,7 @@ namespace OpenVulkano
#endif #endif
} }
Array<char> Utils::ReadFile(const std::string& filePath, bool emptyOnMissing) Array<char> Utils::ReadFile(const std::string& filePath, bool emptyOnMissing, bool nullTerminateString)
{ {
std::ifstream file(filePath, std::ios::ate | std::ios::binary); std::ifstream file(filePath, std::ios::ate | std::ios::binary);
if (!file.is_open()) if (!file.is_open())
@@ -69,7 +69,9 @@ namespace OpenVulkano
if (emptyOnMissing) return {}; if (emptyOnMissing) return {};
throw std::runtime_error("Failed to open file '" + filePath + "'!"); throw std::runtime_error("Failed to open file '" + filePath + "'!");
} }
const size_t fileSize = static_cast<size_t>(file.tellg()); size_t fileSize = static_cast<size_t>(file.tellg());
if (nullTerminateString) fileSize++;
Array<char> data(fileSize); Array<char> data(fileSize);
file.seekg(0); file.seekg(0);
file.read(data.Data(), fileSize); file.read(data.Data(), fileSize);

3
openVulkanoCpp/Base/Utils.hpp
View File

@@ -159,7 +159,8 @@ namespace OpenVulkano
return subs; return subs;
} }
static Array<char> ReadFile(const std::string& filePath, bool emptyOnMissing = false); static Array<char> ReadFile(const std::string& filePath, bool emptyOnMissing = false,
bool nullTerminateString = false);
template<class T> template<class T>
static int GetUniqueTypeId() static int GetUniqueTypeId()