INSANEMODE/OpenAssetTools
1
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-07-01 00:57:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

refactor: extract material name into common source file

Browse Source
This commit is contained in:
Jan
2025-06-25 19:34:09 +01:00
parent dceca0ec9a
commit 6c114fe58a
4 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/ObjCommon/Material/MaterialCommon.cpp Normal file
View File

@ -0,0 +1,22 @@
#include "MaterialCommon.h"
#include <algorithm>
#include <format>
namespace material
{
std::string GetFileNameForAssetName(const std::string& assetName)
{
std::string sanitizedFileName(assetName);
if (sanitizedFileName[0] == '*')
{
std::ranges::replace(sanitizedFileName, '*', '_');
const auto parenthesisPos = sanitizedFileName.find('(');
if (parenthesisPos != std::string::npos)
sanitizedFileName.erase(parenthesisPos);
sanitizedFileName = std::format("generated/{}", sanitizedFileName);
}
return std::format("materials/{}.json", sanitizedFileName);
}
} // namespace material

8
src/ObjCommon/Material/MaterialCommon.h Normal file
View File

@ -0,0 +1,8 @@
#pragma once
#include <string>
namespace material
{
std::string GetFileNameForAssetName(const std::string& assetName);
}

20
src/ObjLoading/Game/IW5/Material/LoaderMaterialIW5.cpp
View File

@ -2,9 +2,8 @@
#include "Game/IW5/IW5.h" #include "Game/IW5/IW5.h"
#include "Game/IW5/Material/JsonMaterialLoaderIW5.h" #include "Game/IW5/Material/JsonMaterialLoaderIW5.h"
#include "Material/MaterialCommon.h"
#include <algorithm>
#include <cstring>
#include <format> #include <format>
#include <iostream> #include <iostream>
@ -23,7 +22,7 @@ namespace
AssetCreationResult CreateAsset(const std::string& assetName, AssetCreationContext& context) override AssetCreationResult CreateAsset(const std::string& assetName, AssetCreationContext& context) override
{ {
const auto file = m_search_path.Open(GetFileNameForAsset(assetName)); const auto file = m_search_path.Open(material::GetFileNameForAssetName(assetName));
if (!file.IsOpen()) if (!file.IsOpen())
return AssetCreationResult::NoAction(); return AssetCreationResult::NoAction();
@ -41,21 +40,6 @@ namespace
} }
private: private:
std::string GetFileNameForAsset(const std::string& assetName)
{
std::string sanitizedFileName(assetName);
if (sanitizedFileName[0] == '*')
{
std::ranges::replace(sanitizedFileName, '*', '_');
const auto parenthesisPos = sanitizedFileName.find('(');
if (parenthesisPos != std::string::npos)
sanitizedFileName.erase(parenthesisPos);
sanitizedFileName = std::format("generated/{}", sanitizedFileName);
}
return std::format("materials/{}.json", sanitizedFileName);
}
MemoryManager& m_memory; MemoryManager& m_memory;
ISearchPath& m_search_path; ISearchPath& m_search_path;
}; };

20
src/ObjLoading/Game/T6/Material/LoaderMaterialT6.cpp
View File

@ -2,9 +2,8 @@
#include "Game/T6/Material/JsonMaterialLoaderT6.h" #include "Game/T6/Material/JsonMaterialLoaderT6.h"
#include "Game/T6/T6.h" #include "Game/T6/T6.h"
#include "Material/MaterialCommon.h"
#include <algorithm>
#include <cstring>
#include <format> #include <format>
#include <iostream> #include <iostream>
@ -23,7 +22,7 @@ namespace
AssetCreationResult CreateAsset(const std::string& assetName, AssetCreationContext& context) override AssetCreationResult CreateAsset(const std::string& assetName, AssetCreationContext& context) override
{ {
const auto file = m_search_path.Open(GetFileNameForAsset(assetName)); const auto file = m_search_path.Open(material::GetFileNameForAssetName(assetName));
if (!file.IsOpen()) if (!file.IsOpen())
return AssetCreationResult::NoAction(); return AssetCreationResult::NoAction();
@ -41,21 +40,6 @@ namespace
} }
private: private:
static std::string GetFileNameForAsset(const std::string& assetName)
{
std::string sanitizedFileName(assetName);
if (sanitizedFileName[0] == '*')
{
std::ranges::replace(sanitizedFileName, '*', '_');
const auto parenthesisPos = sanitizedFileName.find('(');
if (parenthesisPos != std::string::npos)
sanitizedFileName.erase(parenthesisPos);
sanitizedFileName = "generated/" + sanitizedFileName;
}
return std::format("materials/{}.json", sanitizedFileName);
}
MemoryManager& m_memory; MemoryManager& m_memory;
ISearchPath& m_search_path; ISearchPath& m_search_path;
}; };