zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-03-17 18:33:02 +00:00
Code Activity

chore: refactor IW4 asset loaders

Browse Source
This commit is contained in:
Jan
2024-12-25 21:39:05 +01:00
parent f9456101e6
commit 7ef944ebd4
139 changed files with 2370 additions and 2965 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ObjLoading/Weapon/AccuracyGraphLoader.cpp
View File

@@ -7,9 +7,8 @@
namespace
{
std::unique_ptr<GenericGraph2D> LoadAccuracyGraph(const IAssetLoadingManager* manager, const std::string& graphName, const std::string& subFolder)
std::unique_ptr<GenericGraph2D> LoadAccuracyGraph(ISearchPath& searchPath, const std::string& graphName, const std::string& subFolder)
{
auto& searchPath = manager->GetAssetLoadingContext()->m_raw_search_path;
const auto fileName = std::format("accuracy/{}/{}", subFolder, graphName);
const auto file = searchPath.Open(fileName);
if (!file.IsOpen())
@@ -22,13 +21,13 @@ namespace
}
} // namespace
const GenericGraph2D* AccuracyGraphLoader::LoadAiVsAiGraph(const IAssetLoadingManager* manager, const std::string& graphName)
const GenericGraph2D* AccuracyGraphLoader::LoadAiVsAiGraph(ISearchPath& searchPath, const std::string& graphName)
{
const auto alreadyLoadedGraph = m_loaded_ai_vs_ai_graphs.find(graphName);
if (alreadyLoadedGraph != m_loaded_ai_vs_ai_graphs.end())
return alreadyLoadedGraph->second.get();
auto graph = LoadAccuracyGraph(manager, graphName, "aivsai");
auto graph = LoadAccuracyGraph(searchPath, graphName, "aivsai");
if (!graph)
return nullptr;
@@ -38,13 +37,13 @@ const GenericGraph2D* AccuracyGraphLoader::LoadAiVsAiGraph(const IAssetLoadingMa
return graphPtr;
}
const GenericGraph2D* AccuracyGraphLoader::LoadAiVsPlayerGraph(const IAssetLoadingManager* manager, const std::string& graphName)
const GenericGraph2D* AccuracyGraphLoader::LoadAiVsPlayerGraph(ISearchPath& searchPath, const std::string& graphName)
{
const auto alreadyLoadedGraph = m_loaded_ai_vs_player_graphs.find(graphName);
if (alreadyLoadedGraph != m_loaded_ai_vs_player_graphs.end())
return alreadyLoadedGraph->second.get();
auto graph = LoadAccuracyGraph(manager, graphName, "aivsplayer");
auto graph = LoadAccuracyGraph(searchPath, graphName, "aivsplayer");
if (!graph)
return nullptr;

9
src/ObjLoading/Weapon/AccuracyGraphLoader.h
View File

@@ -1,15 +1,18 @@
#pragma once
#include "AssetLoading/IAssetLoadingManager.h"
#include "AssetLoading/IZoneAssetLoaderState.h"
#include "Parsing/GenericGraph2D.h"
#include "SearchPath/ISearchPath.h"
#include <memory>
#include <string>
#include <unordered_map>
class AccuracyGraphLoader final : public IZoneAssetLoaderState
{
public:
const GenericGraph2D* LoadAiVsAiGraph(const IAssetLoadingManager* manager, const std::string& graphName);
const GenericGraph2D* LoadAiVsPlayerGraph(const IAssetLoadingManager* manager, const std::string& graphName);
const GenericGraph2D* LoadAiVsAiGraph(ISearchPath& searchPath, const std::string& graphName);
const GenericGraph2D* LoadAiVsPlayerGraph(ISearchPath& searchPath, const std::string& graphName);
private:
std::unordered_map<std::string, std::unique_ptr<GenericGraph2D>> m_loaded_ai_vs_ai_graphs;