zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-07-01 08:41:52 +00:00
Code Activity

chore: rename ZoneAssetLoaderState to ZoneAssetCreationState

Browse Source
This commit is contained in:
Jan
2025-01-03 11:01:44 +01:00
parent 9068e96dfa
commit 416823c6cd
24 changed files with 104 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ObjLoading/Game/IW4/Material/LoaderMaterialIW4.cpp
View File

@ -44,7 +44,7 @@ namespace
m_search_path(searchPath),
m_context(context),
m_registration(registration),
m_state_map_cache(context.GetZoneAssetLoaderState<techset::TechniqueStateMapCache>()),
m_state_map_cache(context.GetZoneAssetCreationState<techset::TechniqueStateMapCache>()),
m_base_state_bits{},
m_techset_creator(CreateTechsetLoader(memory, searchPath))
{
@ -792,7 +792,7 @@ namespace
m_registration.AddDependency(techset);
m_material.techniqueSet = techset->Asset();
auto& definitionCache = m_context.GetZoneAssetLoaderState<techset::TechsetDefinitionCache>();
auto& definitionCache = m_context.GetZoneAssetCreationState<techset::TechsetDefinitionCache>();
bool failure = false;
const auto* techsetDefinition = m_techset_creator->LoadTechsetDefinition(techsetName, m_context, failure);

6
src/ObjLoading/Game/IW4/Menu/LoaderMenuListIW4.cpp
View File

@ -28,8 +28,8 @@ namespace
std::vector<menuDef_t*> menus;
AssetRegistration<AssetMenuList> registration(assetName);
auto& zoneState = context.GetZoneAssetLoaderState<menu::MenuAssetZoneState>();
auto& conversionState = context.GetZoneAssetLoaderState<MenuConversionZoneState>();
auto& zoneState = context.GetZoneAssetCreationState<menu::MenuAssetZoneState>();
auto& conversionState = context.GetZoneAssetCreationState<MenuConversionZoneState>();
std::deque<std::string> menuLoadQueue;
const auto alreadyLoadedMenuListFileMenus = conversionState.m_menus_by_filename.find(assetName);
@ -74,7 +74,7 @@ namespace
void FinalizeZone(AssetCreationContext& context) override
{
context.GetZoneAssetLoaderState<MenuConversionZoneState>().FinalizeSupportingData();
context.GetZoneAssetCreationState<MenuConversionZoneState>().FinalizeSupportingData();
}
private:

4
src/ObjLoading/Game/IW4/Menu/MenuConversionZoneStateIW4.h
View File

@ -1,13 +1,13 @@
#pragma once
#include "Asset/IZoneAssetLoaderState.h"
#include "Asset/IZoneAssetCreationState.h"
#include "Game/IW4/IW4.h"
#include <map>
namespace IW4
{
class MenuConversionZoneState final : public IZoneAssetLoaderState
class MenuConversionZoneState final : public IZoneAssetCreationState
{
Zone* m_zone;
std::vector<Statement_s*> m_functions;

4
src/ObjLoading/Game/IW4/Menu/MenuConverterIW4.cpp
View File

@ -1112,8 +1112,8 @@ namespace
public:
MenuConverter(const bool disableOptimizations, ISearchPath& searchPath, MemoryManager& memory, AssetCreationContext& context)
: AbstractMenuConverter(disableOptimizations, searchPath, memory, context),
m_conversion_zone_state(context.GetZoneAssetLoaderState<MenuConversionZoneState>()),
m_parsing_zone_state(context.GetZoneAssetLoaderState<MenuAssetZoneState>())
m_conversion_zone_state(context.GetZoneAssetCreationState<MenuConversionZoneState>()),
m_parsing_zone_state(context.GetZoneAssetCreationState<MenuAssetZoneState>())
{
}

16
src/ObjLoading/Game/IW4/Techset/LoaderTechsetIW4.cpp
View File

@ -41,7 +41,7 @@ namespace
}
};
class TechniqueZoneLoadingState final : public IZoneAssetLoaderState
class TechniqueZoneLoadingState final : public IZoneAssetCreationState
{
public:
typedef const float (*literal_t)[4];
@ -84,7 +84,7 @@ namespace
std::map<techset::ShaderArgumentLiteralSource, literal_t> m_allocated_literals;
};
class ShaderInfoFromFileSystemCacheState final : public IZoneAssetLoaderState
class ShaderInfoFromFileSystemCacheState final : public IZoneAssetCreationState
{
std::unordered_map<std::string, std::unique_ptr<d3d9::ShaderInfo>> m_cached_shader_info;
@ -205,9 +205,9 @@ namespace
m_search_path(searchPath),
m_memory(memory),
m_context(context),
m_zone_state(context.GetZoneAssetLoaderState<TechniqueZoneLoadingState>()),
m_state_map_cache(context.GetZoneAssetLoaderState<techset::TechniqueStateMapCache>()),
m_shader_info_cache(context.GetZoneAssetLoaderState<ShaderInfoFromFileSystemCacheState>()),
m_zone_state(context.GetZoneAssetCreationState<TechniqueZoneLoadingState>()),
m_state_map_cache(context.GetZoneAssetCreationState<techset::TechniqueStateMapCache>()),
m_shader_info_cache(context.GetZoneAssetCreationState<ShaderInfoFromFileSystemCacheState>()),
m_techset_creator(techsetCreator)
{
}
@ -1034,7 +1034,7 @@ namespace
: m_search_path(searchPath),
m_memory(memory),
m_context(context),
m_zone_state(context.GetZoneAssetLoaderState<TechniqueZoneLoadingState>()),
m_zone_state(context.GetZoneAssetCreationState<TechniqueZoneLoadingState>()),
m_techset_creator(techsetCreator)
{
}
@ -1313,7 +1313,7 @@ namespace
techset::TechsetDefinition* LoadTechsetDefinition(const std::string& assetName, AssetCreationContext& context, bool& failure) override
{
failure = false;
auto& definitionCache = context.GetZoneAssetLoaderState<techset::TechsetDefinitionCache>();
auto& definitionCache = context.GetZoneAssetCreationState<techset::TechsetDefinitionCache>();
auto* cachedTechsetDefinition = definitionCache.GetCachedTechsetDefinition(assetName);
if (cachedTechsetDefinition)
return cachedTechsetDefinition;
@ -1340,7 +1340,7 @@ namespace
const state_map::StateMapDefinition* LoadStateMapDefinition(const std::string& stateMapName, AssetCreationContext& context) override
{
auto& stateMapCache = context.GetZoneAssetLoaderState<techset::TechniqueStateMapCache>();
auto& stateMapCache = context.GetZoneAssetCreationState<techset::TechniqueStateMapCache>();
auto* cachedStateMap = stateMapCache.GetCachedStateMap(stateMapName);
if (cachedStateMap)
return cachedStateMap;

2
src/ObjLoading/Game/IW4/Weapon/InfoStringLoaderWeaponIW4.cpp
View File

@ -392,7 +392,7 @@ namespace
bool LoadAccuracyGraphs(WeaponFullDef& weaponFullDef, MemoryManager& memory, ISearchPath& searchPath, AssetCreationContext& context)
{
auto& accuracyGraphLoader = context.GetZoneAssetLoaderState<AccuracyGraphLoader>();
auto& accuracyGraphLoader = context.GetZoneAssetCreationState<AccuracyGraphLoader>();
if (weaponFullDef.weapDef.aiVsAiAccuracyGraphName && weaponFullDef.weapDef.aiVsAiAccuracyGraphName[0])
{

6
src/ObjLoading/Game/IW5/Menu/LoaderMenuListIW5.cpp
View File

@ -28,8 +28,8 @@ namespace
std::vector<menuDef_t*> menus;
AssetRegistration<AssetMenuList> registration(assetName);
auto& zoneState = context.GetZoneAssetLoaderState<menu::MenuAssetZoneState>();
auto& conversionState = context.GetZoneAssetLoaderState<MenuConversionZoneState>();
auto& zoneState = context.GetZoneAssetCreationState<menu::MenuAssetZoneState>();
auto& conversionState = context.GetZoneAssetCreationState<MenuConversionZoneState>();
std::deque<std::string> menuLoadQueue;
const auto alreadyLoadedMenuListFileMenus = conversionState.m_menus_by_filename.find(assetName);
@ -74,7 +74,7 @@ namespace
void FinalizeZone(AssetCreationContext& context) override
{
context.GetZoneAssetLoaderState<MenuConversionZoneState>().FinalizeSupportingData();
context.GetZoneAssetCreationState<MenuConversionZoneState>().FinalizeSupportingData();
}
private:

4
src/ObjLoading/Game/IW5/Menu/MenuConversionZoneStateIW5.h
View File

@ -1,13 +1,13 @@
#pragma once
#include "Asset/IZoneAssetLoaderState.h"
#include "Asset/IZoneAssetCreationState.h"
#include "Game/IW5/IW5.h"
#include <map>
namespace IW5
{
class MenuConversionZoneState final : public IZoneAssetLoaderState
class MenuConversionZoneState final : public IZoneAssetCreationState
{
Zone* m_zone;
std::vector<Statement_s*> m_functions;

4
src/ObjLoading/Game/IW5/Menu/MenuConverterIW5.cpp
View File

@ -1120,8 +1120,8 @@ namespace
public:
MenuConverter(const bool disableOptimizations, ISearchPath& searchPath, MemoryManager& memory, AssetCreationContext& context)
: AbstractMenuConverter(disableOptimizations, searchPath, memory, context),
m_conversion_zone_state(context.GetZoneAssetLoaderState<MenuConversionZoneState>()),
m_parsing_zone_state(context.GetZoneAssetLoaderState<MenuAssetZoneState>())
m_conversion_zone_state(context.GetZoneAssetCreationState<MenuConversionZoneState>()),
m_parsing_zone_state(context.GetZoneAssetCreationState<MenuAssetZoneState>())
{
}

2
src/ObjLoading/Game/IW5/Weapon/InfoStringLoaderWeaponIW5.cpp
View File

@ -822,7 +822,7 @@ namespace
bool LoadAccuracyGraphs(WeaponFullDef& weaponFullDef, MemoryManager& memory, ISearchPath& searchPath, AssetCreationContext& context)
{
auto& accuracyGraphLoader = context.GetZoneAssetLoaderState<AccuracyGraphLoader>();
auto& accuracyGraphLoader = context.GetZoneAssetCreationState<AccuracyGraphLoader>();
if (weaponFullDef.weapDef.aiVsAiAccuracyGraphName && weaponFullDef.weapDef.aiVsAiAccuracyGraphName[0])
{

2
src/ObjLoading/Game/T6/Weapon/InfoStringLoaderWeaponT6.cpp
View File

@ -409,7 +409,7 @@ namespace
bool LoadAccuracyGraphs(WeaponFullDef& weaponFullDef, MemoryManager& memory, ISearchPath& searchPath, AssetCreationContext& context)
{
auto& accuracyGraphLoader = context.GetZoneAssetLoaderState<AccuracyGraphLoader>();
auto& accuracyGraphLoader = context.GetZoneAssetCreationState<AccuracyGraphLoader>();
if (weaponFullDef.weapDef.aiVsAiAccuracyGraphName && weaponFullDef.weapDef.aiVsAiAccuracyGraphName[0])
{