Skip to content

Commit 920d42a

Browse files
committed
Factory settings update
Pushing generic settings details in the root function and making sure it's getting called when creating new factories to ensure they are initialized knowing about those settings
1 parent 872bd39 commit 920d42a

17 files changed

Lines changed: 37 additions & 32 deletions

Plugins/PCGExtendedToolkit/Source/PCGExtendedToolkit/Private/Actions/PCGExActionFactoryProvider.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,13 @@ TArray<FPCGPinProperties> UPCGExActionProviderSettings::InputPinProperties() con
107107

108108
UPCGExFactoryData* UPCGExActionProviderSettings::CreateFactory(FPCGExContext* InContext, UPCGExFactoryData* InFactory) const
109109
{
110+
Super::CreateFactory(InContext, InFactory);
111+
110112
if (UPCGExActionFactoryData* TypedFactory = Cast<UPCGExActionFactoryData>(InFactory))
111113
{
112114
if (!GetInputFactories(
113115
InContext, PCGExActions::SourceConditionsFilterLabel, TypedFactory->FilterFactories,
114-
PCGExFactories::PointFilters, true))
116+
PCGExFactories::PointFilters, !bQuietMissingInputError))
115117
{
116118
return nullptr;
117119
}

Plugins/PCGExtendedToolkit/Source/PCGExtendedToolkit/Private/Data/PCGExPointStates.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,5 @@ namespace PCGExPointStates
7272

7373
UPCGExFactoryData* UPCGExPointStateFactoryProviderSettings::CreateFactory(FPCGExContext* InContext, UPCGExFactoryData* InFactory) const
7474
{
75-
return nullptr;
75+
return Super::CreateFactory(InContext, InFactory);
7676
}

Plugins/PCGExtendedToolkit/Source/PCGExtendedToolkit/Private/Graph/Edges/Properties/PCGExVtxPropertyFactoryProvider.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,7 @@ TArray<FPCGPinProperties> UPCGExVtxPropertyProviderSettings::InputPinProperties(
5151

5252
UPCGExFactoryData* UPCGExVtxPropertyProviderSettings::CreateFactory(FPCGExContext* InContext, UPCGExFactoryData* InFactory) const
5353
{
54-
//UPCGExVtxPropertyFactoryData* NewFactory = Cast<UPCGExVtxPropertyFactoryData>(InFactory);
55-
//SamplerFactory->Priority = Priority;
56-
return InFactory;
54+
return Super::CreateFactory(InContext, InFactory);
5755
}
5856

5957

Plugins/PCGExtendedToolkit/Source/PCGExtendedToolkit/Private/Graph/Filters/Edges/PCGExIsoEdgeDirectionFilter.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,15 @@ TArray<FPCGPinProperties> UPCGExIsoEdgeDirectionFilterProviderSettings::InputPin
105105
UPCGExFactoryData* UPCGExIsoEdgeDirectionFilterProviderSettings::CreateFactory(FPCGExContext* InContext, UPCGExFactoryData* InFactory) const
106106
{
107107
UPCGExIsoEdgeDirectionFilterFactory* NewFactory = InContext->ManagedObjects->New<UPCGExIsoEdgeDirectionFilterFactory>();
108-
Super::CreateFactory(InContext, InFactory);
108+
109109
NewFactory->Config = Config;
110-
111110
if (Config.DirectionSettings.DirectionMethod == EPCGExEdgeDirectionMethod::EndpointsSort)
112111
{
113112
NewFactory->EdgeSortingRules = PCGExSorting::GetSortingRules(InContext, PCGExGraph::SourceEdgeSortingRules);
114113
}
115114

115+
Super::CreateFactory(InContext, NewFactory);
116+
116117
if (!NewFactory->Init(InContext)) { InContext->ManagedObjects->Destroy(NewFactory); }
117118
return NewFactory;
118119
}

Plugins/PCGExtendedToolkit/Source/PCGExtendedToolkit/Private/Graph/Probes/PCGExProbeFactoryProvider.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ UPCGExProbeOperation* UPCGExProbeFactoryData::CreateOperation(FPCGExContext* InC
1313

1414
UPCGExFactoryData* UPCGExProbeFactoryProviderSettings::CreateFactory(FPCGExContext* InContext, UPCGExFactoryData* InFactory) const
1515
{
16-
return InFactory;
16+
return Super::CreateFactory(InContext,InFactory);
1717
}
1818

1919
#undef LOCTEXT_NAMESPACE

Plugins/PCGExtendedToolkit/Source/PCGExtendedToolkit/Private/Graph/States/PCGExClusterStates.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,11 @@ UPCGExFactoryData* UPCGExClusterStateFactoryProviderSettings::CreateFactory(FPCG
118118
NewFactory->Priority = Priority;
119119
NewFactory->Config = Config;
120120

121+
Super::CreateFactory(InContext, NewFactory);
122+
121123
if (!GetInputFactories(
122124
InContext, PCGExPointFilter::SourceFiltersLabel, NewFactory->FilterFactories,
123-
PCGExFactories::ClusterNodeFilters))
125+
PCGExFactories::ClusterNodeFilters, !bQuietMissingInputError))
124126
{
125127
InContext->ManagedObjects->Destroy(NewFactory);
126128
return nullptr;

Plugins/PCGExtendedToolkit/Source/PCGExtendedToolkit/Private/Misc/Filters/PCGExFilterFactoryProvider.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ FString UPCGExFilterProviderSettings::GetDisplayName() const { return TEXT("");
1414

1515
UPCGExFactoryData* UPCGExFilterProviderSettings::CreateFactory(FPCGExContext* InContext, UPCGExFactoryData* InFactory) const
1616
{
17-
if (UPCGExFilterFactoryData* OutFilterFactory = static_cast<UPCGExFilterFactoryData*>(InFactory)) { OutFilterFactory->Priority = Priority; }
18-
return InFactory;
17+
UPCGExFilterFactoryData* OutFilterFactory = Cast<UPCGExFilterFactoryData>(InFactory);
18+
OutFilterFactory->Priority = Priority;
19+
20+
return Super::CreateFactory(InContext, InFactory);
1921
}
2022

2123
#undef LOCTEXT_NAMESPACE

Plugins/PCGExtendedToolkit/Source/PCGExtendedToolkit/Private/Misc/Filters/PCGExFilterGroupFactoryProvider.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,16 @@ UPCGExFactoryData* UPCGExFilterGroupProviderSettings::CreateFactory(FPCGExContex
4848

4949
NewFactory->Priority = Priority;
5050
NewFactory->bInvert = bInvert;
51-
51+
5252
if (!GetInputFactories(
5353
InContext, PCGExPointFilter::SourceFiltersLabel, NewFactory->FilterFactories,
54-
PCGExFactories::AnyFilters, true))
54+
PCGExFactories::AnyFilters, !bQuietMissingInputError))
5555
{
5656
InContext->ManagedObjects->Destroy(NewFactory);
5757
return nullptr;
5858
}
5959

60-
return NewFactory;
60+
return Super::CreateFactory(InContext, NewFactory);
6161
}
6262

6363
#undef LOCTEXT_NAMESPACE

Plugins/PCGExtendedToolkit/Source/PCGExtendedToolkit/Private/Misc/PCGExModularPartitionByValues.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ UPCGExFactoryData* UPCGExPartitionRuleProviderSettings::CreateFactory(FPCGExCont
1313
{
1414
UPCGExPartitionRule* NewFactory = InContext->ManagedObjects->New<UPCGExPartitionRule>();
1515
NewFactory->Config = Config;
16-
return NewFactory;
16+
return Super::CreateFactory(InContext, NewFactory);
1717
}
1818

1919
#if WITH_EDITOR

Plugins/PCGExtendedToolkit/Source/PCGExtendedToolkit/Private/PCGExFactoryProvider.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ void FPCGExFactoryProviderContext::LaunchDeferredCallback(PCGExMT::FSimpleCallba
9090

9191
UPCGExFactoryData* UPCGExFactoryProviderSettings::CreateFactory(FPCGExContext* InContext, UPCGExFactoryData* InFactory) const
9292
{
93+
InFactory->bCleanupConsumableAttributes = bCleanupConsumableAttributes;
94+
InFactory->bQuietMissingInputError = bQuietMissingInputError;
9395
return InFactory;
9496
}
9597

0 commit comments

Comments
 (0)