Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve performance

This commit is contained in:
halx99 2022-10-07 21:36:38 +08:00
parent 29d4e3209e
commit 29d99c32fe
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
core/platform/CCFileUtils.cpp
View File

@ -55,17 +55,17 @@ THE SOFTWARE.
#include "base/filesystem.h" #include "base/filesystem.h"
# if defined(_WIN32) #if defined(_WIN32)
inline stdfs::path toFspath(const std::string_view& pathSV) inline stdfs::path toFspath(const std::string_view& pathSV)
{ {
return stdfs::path{ntcvt::from_chars(pathSV)}; return stdfs::path{ntcvt::from_chars(pathSV)};
} }
# else #else
inline stdfs::path toFspath(const std::string_view& pathSV) inline stdfs::path toFspath(const std::string_view& pathSV)
{ {
return stdfs::path{pathSV}; return stdfs::path{pathSV};
} }
# endif #endif
NS_AX_BEGIN NS_AX_BEGIN
@ -1141,17 +1141,16 @@ std::vector<std::string> FileUtils::listFiles(std::string_view dirPath) const
const auto isDir = entry.is_directory(); const auto isDir = entry.is_directory();
if (isDir || entry.is_regular_file()) if (isDir || entry.is_regular_file())
{ {
# if (AX_TARGET_PLATFORM == AX_PLATFORM_WIN32) #if (AX_TARGET_PLATFORM == AX_PLATFORM_WIN32)
# if defined(__cpp_lib_char8_t) # if defined(__cpp_lib_char8_t)
std::u8string u8path = entry.path().u8string(); auto&& pathStr = (std::string &&)(entry.path().u8string());
std::string pathStr = {u8path.begin(), u8path.end()};
# else
std::string pathStr = entry.path().u8string();
# endif
std::replace(pathStr.begin(), pathStr.end(), '\\', '/');
# else # else
std::string pathStr = entry.path().string(); auto&& pathStr = entry.path().u8string();
# endif # endif
std::replace(pathStr.begin(), pathStr.end(), '\\', '/');
#else
std::string pathStr = entry.path().string();
#endif
if (isDir) if (isDir)
pathStr += '/'; pathStr += '/';
files.emplace_back(std::move(pathStr)); files.emplace_back(std::move(pathStr));
@ -1173,17 +1172,16 @@ void FileUtils::listFilesRecursively(std::string_view dirPath, std::vector<std::
const auto isDir = entry.is_directory(); const auto isDir = entry.is_directory();
if (isDir || entry.is_regular_file()) if (isDir || entry.is_regular_file())
{ {
# if (AX_TARGET_PLATFORM == AX_PLATFORM_WIN32) #if (AX_TARGET_PLATFORM == AX_PLATFORM_WIN32)
# if defined(__cpp_lib_char8_t) # if defined(__cpp_lib_char8_t)
std::u8string u8path = entry.path().u8string(); auto&& pathStr = (std::string &&)(entry.path().u8string());
std::string pathStr = {u8path.begin(), u8path.end()};
# else
std::string pathStr = entry.path().u8string();
# endif
std::replace(pathStr.begin(), pathStr.end(), '\\', '/');
# else # else
std::string pathStr = entry.path().string(); auto&& pathStr = entry.path().u8string();
# endif # endif
std::replace(pathStr.begin(), pathStr.end(), '\\', '/');
#else
std::string pathStr = entry.path().string();
#endif
if (isDir) if (isDir)
pathStr += '/'; pathStr += '/';
files->emplace_back(std::move(pathStr)); files->emplace_back(std::move(pathStr));