zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-19 15:52:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: inject ZoneAssetCreationStateCollection to states

Browse Source
This commit is contained in:
Jan 2025-01-03 12:45:59 +01:00
parent ef862ff246
commit 2313da1c12
No known key found for this signature in database
GPG Key ID: 44B581F78FF5C57C
7 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ObjLoading/Asset/AssetCreationContext.cpp
View File

@ -64,6 +64,7 @@ std::unique_ptr<XAssetInfoGeneric> GenericAssetRegistration::CreateXAssetInfo()
AssetCreationContext::AssetCreationContext(Zone& zone, const AssetCreatorCollection* creators, const IgnoredAssetLookup* ignoredAssetLookup)
: ZoneAssetCreationStateContainer(zone),
m_zone(zone),
m_creators(creators),
m_ignored_asset_lookup(ignoredAssetLookup)
{

1
src/ObjLoading/Asset/AssetCreationContext.h
View File

@ -68,6 +68,7 @@ public:
private:
[[nodiscard]] XAssetInfoGeneric* LoadDefaultAssetDependency(asset_type_t assetType, const std::string& assetName);
Zone& m_zone;
const AssetCreatorCollection* m_creators;
const IgnoredAssetLookup* m_ignored_asset_lookup;
};

25
src/ObjLoading/Asset/IZoneAssetCreationState.h
View File

@ -6,6 +6,21 @@
#include <typeindex>
#include <unordered_map>
class ZoneAssetCreationStateContainer;
class ZoneAssetCreationInjection
{
public:
ZoneAssetCreationInjection(ZoneAssetCreationStateContainer& zoneStates, Zone& zone)
: m_zone_states(zoneStates),
m_zone(zone)
{
}
ZoneAssetCreationStateContainer& m_zone_states;
Zone& m_zone;
};
class IZoneAssetCreationState
{
protected:
@ -18,7 +33,7 @@ public:
IZoneAssetCreationState& operator=(const IZoneAssetCreationState& other) = default;
IZoneAssetCreationState& operator=(IZoneAssetCreationState&& other) noexcept = default;
virtual void SetZone(Zone* zone)
virtual void Inject(ZoneAssetCreationInjection& inject)
{
// Do nothing by default
}
@ -28,7 +43,7 @@ class ZoneAssetCreationStateContainer
{
public:
ZoneAssetCreationStateContainer(Zone& zone)
: m_zone(zone)
: m_injection(*this, zone)
{
}
@ -42,16 +57,14 @@ public:
return *dynamic_cast<T*>(foundEntry->second.get());
auto newState = std::make_unique<T>();
newState->SetZone(&m_zone);
newState->Inject(m_injection);
auto* newStatePtr = newState.get();
m_zone_asset_creation_states.emplace(std::make_pair<std::type_index, std::unique_ptr<IZoneAssetCreationState>>(typeid(T), std::move(newState)));
return *newStatePtr;
}
protected:
Zone& m_zone;
private:
ZoneAssetCreationInjection m_injection;
std::unordered_map<std::type_index, std::unique_ptr<IZoneAssetCreationState>> m_zone_asset_creation_states;
};

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

@ -10,11 +10,11 @@ MenuConversionZoneState::MenuConversionZoneState()
{
}
void MenuConversionZoneState::SetZone(Zone* zone)
void MenuConversionZoneState::Inject(ZoneAssetCreationInjection& inject)
{
auto* memory = zone->GetMemory();
auto* memory = inject.m_zone.GetMemory();
m_zone = zone;
m_zone = &inject.m_zone;
m_supporting_data = memory->Create<ExpressionSupportingData>();
memset(m_supporting_data, 0, sizeof(ExpressionSupportingData));
}

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

@ -24,7 +24,7 @@ namespace IW4
ExpressionSupportingData* m_supporting_data;
MenuConversionZoneState();
void SetZone(Zone* zone) override;
void Inject(ZoneAssetCreationInjection& inject) override;
Statement_s* FindFunction(const std::string& functionName);

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

@ -10,11 +10,11 @@ MenuConversionZoneState::MenuConversionZoneState()
{
}
void MenuConversionZoneState::SetZone(Zone* zone)
void MenuConversionZoneState::Inject(ZoneAssetCreationInjection& inject)
{
auto* memory = zone->GetMemory();
auto* memory = inject.m_zone.GetMemory();
m_zone = zone;
m_zone = &inject.m_zone;
m_supporting_data = memory->Create<ExpressionSupportingData>();
memset(m_supporting_data, 0, sizeof(ExpressionSupportingData));
}

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

@ -24,7 +24,7 @@ namespace IW5
ExpressionSupportingData* m_supporting_data;
MenuConversionZoneState();
void SetZone(Zone* zone) override;
void Inject(ZoneAssetCreationInjection& inject) override;
Statement_s* FindFunction(const std::string& functionName);