stringcrc as map key

meta4d-me · Nov 10, 2023 · 63e05e1 · 63e05e1
1 parent 35aafaf
commit 63e05e1
Show file tree

Hide file tree

Showing 6 changed files with 97 additions and 56 deletions.
diff --git a/Engine/Source/Editor/Resources/ResourceBuilder.cpp b/Engine/Source/Editor/Resources/ResourceBuilder.cpp
@@ -1,9 +1,9 @@
 #include "ResourceBuilder.h"
 
 #include "Base/Template.h"
+#include "Log/Log.h"
 #include "Path/Path.h"
 #include "Time/Clock.h"
-#include "Log/Log.h"
 
 #include <cassert>
 
@@ -13,7 +13,7 @@ namespace editor
 ResourceBuilder::ResourceBuilder()
 {
 	std::string modifyCachePath = GetModifyCacheFilePath();
-	if (std::filesystem::exists(cd::MoveTemp(modifyCachePath)))
+	if (engine::Path::FileExists(modifyCachePath.c_str()))
 	{
 		ReadModifyCacheFile();
 	}
@@ -61,7 +61,7 @@ void ResourceBuilder::WriteModifyCacheFile()
 
 	std::string modifyCachePath = GetModifyCacheFilePath();
 
-	if (!std::filesystem::exists(modifyCachePath))
+	if (!engine::Path::FileExists(modifyCachePath.c_str()))
 	{
 		CD_INFO("Creating modify cache file at : {0}", modifyCachePath);
 		std::filesystem::create_directories(std::filesystem::path(modifyCachePath).parent_path());
@@ -111,7 +111,7 @@ ProcessStatus ResourceBuilder::CheckFileStatus(const char* pInputFilePath, const
 
 	const char* key = pOutputFilePath;
 
-	if (!std::filesystem::exists(pInputFilePath))
+	if (!engine::Path::FileExists(pInputFilePath))
 	{
 		CD_ERROR("Input file path {0} does not exist!", pInputFilePath);
 		return ProcessStatus::InputNotExist;
@@ -133,7 +133,7 @@ ProcessStatus ResourceBuilder::CheckFileStatus(const char* pInputFilePath, const
 		return ProcessStatus::InputModified;
 	}
 
-	if (!std::filesystem::exists(pOutputFilePath))
+	if (!engine::Path::FileExists(pOutputFilePath))
 	{
 		CD_INFO("Output file path {0} dose not exist.", pOutputFilePath);
 		return ProcessStatus::OutputNotExist;

diff --git a/Engine/Source/Runtime/Core/StringCrc.h b/Engine/Source/Runtime/Core/StringCrc.h
@@ -19,6 +19,8 @@ class TStringCrc final
 	~TStringCrc() = default;
 
 	constexpr T Value() const { return m_hashValue; }
+	bool operator<(const TStringCrc& other) const { return m_hashValue < other.m_hashValue; }
+	bool operator>(const TStringCrc& other) const { return m_hashValue > other.m_hashValue; }
 	bool operator==(const TStringCrc& other) const { return m_hashValue == other.m_hashValue; }
 	bool operator!=(const TStringCrc& other) const { return m_hashValue != other.m_hashValue; }
 
@@ -28,4 +30,18 @@ class TStringCrc final
 
 using StringCrc = TStringCrc<uint32_t>;
 
+}
+
+namespace std
+{
+
+template<>
+struct hash<engine::StringCrc>
+{
+	uint64_t operator()(const engine::StringCrc& key) const
+	{
+		return static_cast<uint32_t>(key.Value());
+	}
+};
+
 }
diff --git a/Engine/Source/Runtime/Path/Path.cpp b/Engine/Source/Runtime/Path/Path.cpp
@@ -130,4 +130,24 @@ std::string Path::GetTerrainTextureOutputFilePath(const char* pInputFilePath, co
     return ((GetEngineResourcesPath() / "Textures" / "Terrain" / std::filesystem::path(pInputFilePath).stem()).replace_extension(extension)).generic_string();
 }
 
+bool Path::FileExists(const char* pFilePath)
+{
+    return std::filesystem::exists(pFilePath);
+}
+
+bool Path::DirectoryExists(const char* pDirectoryPath)
+{
+    return std::filesystem::is_directory(pDirectoryPath);
+}
+
+std::string Path::GetFileName(const char* pFilePath)
+{
+    return std::filesystem::path(pFilePath).filename().string();
+}
+
+std::string Path::GetFileNameWithoutExtension(const char* pFilePath)
+{
+    return std::filesystem::path(pFilePath).stem().string();
+}
+
 }
diff --git a/Engine/Source/Runtime/Path/Path.h b/Engine/Source/Runtime/Path/Path.h
@@ -29,6 +29,11 @@ class Path
 	static std::string GetTextureOutputFilePath(const char* pInputFilePath, const char* extension);
 	static std::string GetTerrainTextureOutputFilePath(const char* pInputFilePath, const char* extension);
 
+	static bool FileExists(const char* pFilePath);
+	static bool DirectoryExists(const char* pDirectoryPath);
+	static std::string GetFileName(const char* pFilePath);
+	static std::string GetFileNameWithoutExtension(const char* pFilePath);
+
 private:
 	static std::filesystem::path GetEngineBuiltinShaderPath();
 	static std::filesystem::path GetEngineResourcesPath();