Fixes name of private functions for ResourceIdentifier in ResourceMan…

…ager.
Kenix3 · Dec 12, 2024 · 98d9771 · 98d9771
1 parent 275b0d3
commit 98d9771
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/src/resource/ResourceManager.cpp b/src/resource/ResourceManager.cpp
@@ -75,17 +75,17 @@ std::shared_ptr<File> ResourceManager::LoadFileProcess(const std::string& filePa
     return file;
 }
 
-std::shared_ptr<File> ResourceManager::LoadFileProcess(const ResourceIdentifier& cacheData,
+std::shared_ptr<File> ResourceManager::LoadFileProcess(const ResourceIdentifier& identifier,
                                                        std::shared_ptr<ResourceInitData> initData) {
-    if (cacheData.Parent == nullptr) {
-        return LoadFileProcess(cacheData.Path, initData);
+    if (identifier.Parent == nullptr) {
+        return LoadFileProcess(identifier.Path, initData);
     }
-    auto archive = cacheData.Parent;
-    auto file = archive->LoadFile(cacheData.Path, initData);
+    auto archive = identifier.Parent;
+    auto file = archive->LoadFile(identifier.Path, initData);
     if (file != nullptr) {
         SPDLOG_TRACE("Loaded File {} on ResourceManager", file->InitData->Path);
     } else {
-        SPDLOG_TRACE("Could not load File {} in ResourceManager", cacheData.Path);
+        SPDLOG_TRACE("Could not load File {} in ResourceManager", identifier.Path);
     }
     return file;
 }
@@ -223,10 +223,10 @@ std::shared_ptr<IResource> ResourceManager::LoadResource(const std::string& file
 }
 
 std::variant<ResourceManager::ResourceLoadError, std::shared_ptr<IResource>>
-ResourceManager::CheckCache(const ResourceIdentifier& cacheData, bool loadExact) {
-    if (!loadExact && mAltAssetsEnabled && !cacheData.Path.starts_with(IResource::gAltAssetPrefix)) {
-        const auto altPath = IResource::gAltAssetPrefix + cacheData.Path;
-        auto altCacheResult = CheckCache({ altPath, cacheData.Owner, cacheData.Parent }, loadExact);
+ResourceManager::CheckCache(const ResourceIdentifier& identifier, bool loadExact) {
+    if (!loadExact && mAltAssetsEnabled && !identifier.Path.starts_with(IResource::gAltAssetPrefix)) {
+        const auto altPath = IResource::gAltAssetPrefix + identifier.Path;
+        auto altCacheResult = CheckCache({ altPath, identifier.Owner, identifier.Parent }, loadExact);
 
         // If the type held at this cache index is a resource, then we return it.
         // Else we attempt to load standard definition assets.
@@ -237,7 +237,7 @@ ResourceManager::CheckCache(const ResourceIdentifier& cacheData, bool loadExact)
 
     const std::lock_guard<std::mutex> lock(mMutex);
 
-    auto cacheFind = mResourceCache.find(cacheData);
+    auto cacheFind = mResourceCache.find(identifier);
     if (cacheFind == mResourceCache.end()) {
         return ResourceLoadError::NotCached;
     }

diff --git a/src/resource/ResourceManager.h b/src/resource/ResourceManager.h
@@ -87,9 +87,9 @@ class ResourceManager {
     void SetAltAssetsEnabled(bool isEnabled);
 
   protected:
-    std::variant<ResourceLoadError, std::shared_ptr<IResource>> CheckCache(const ResourceIdentifier& cacheData,
+    std::variant<ResourceLoadError, std::shared_ptr<IResource>> CheckCache(const ResourceIdentifier& identifier,
                                                                            bool loadExact = false);
-    std::shared_ptr<File> LoadFileProcess(const ResourceIdentifier& cacheData,
+    std::shared_ptr<File> LoadFileProcess(const ResourceIdentifier& identifier,
                                           std::shared_ptr<ResourceInitData> initData = nullptr);
     std::variant<ResourceLoadError, std::shared_ptr<IResource>> CheckCache(const std::string& filePath,
                                                                            bool loadExact = false);