Entry Count Filter Update

Author: Nebukam

Source/PCGExtendedToolkit/Private/Misc/CollectionFilters/PCGExEntryCountFilter.cpp

@@ -4,6 +4,7 @@
 #include "Misc/CollectionFilters/PCGExEntryCountFilter.h"
 
 #include "PCGExHelpers.h"
+#include "Data/PCGExDataHelpers.h"
 #include "Data/PCGExPointIO.h"
 
 #define LOCTEXT_NAMESPACE "PCGExCompareFilterDefinition"
@@ -16,7 +17,22 @@ TSharedPtr<PCGExPointFilter::IFilter> UPCGExEntryCountFilterFactory::CreateFilte
 
 bool PCGExPointFilter::FEntryCountFilter::Test(const TSharedPtr<PCGExData::FPointIO>& IO, const TSharedPtr<PCGExData::FPointIOCollection>& ParentCollection) const
 {
-	return PCGExCompare::Compare(TypedFilterFactory->Config.Comparison, IO->GetNum(), TypedFilterFactory->Config.OperandB);
+	int32 B = TypedFilterFactory->Config.OperandB;
+	if (TypedFilterFactory->Config.CompareAgainst == EPCGExInputValueType::Attribute)
+	{
+		if (!PCGExDataHelpers::TryReadDataValue(IO->GetContext(), IO->GetIn(), TypedFilterFactory->Config.OperandBAttr, B))
+		{
+			switch (TypedFilterFactory->Config.MissingAttributeFallback)
+			{
+			case EPCGExFilterFallback::Pass:
+				return true;
+			case EPCGExFilterFallback::Fail:
+				return false;
+			}
+		}
+	}
+
+	return PCGExCompare::Compare(TypedFilterFactory->Config.Comparison, IO->GetNum(), B, TypedFilterFactory->Config.Tolerance);
 }
 
 PCGEX_CREATE_FILTER_FACTORY(EntryCount)
@@ -25,7 +41,8 @@ PCGEX_CREATE_FILTER_FACTORY(EntryCount)
 FString UPCGExEntryCountFilterProviderSettings::GetDisplayName() const
 {
 	FString DisplayName = TEXT("Entry Count ") + PCGExCompare::ToString(Config.Comparison);
-	DisplayName += FString::Printf(TEXT("%d"), Config.OperandB);
+	if (Config.CompareAgainst == EPCGExInputValueType::Constant) { DisplayName += FString::Printf(TEXT("%d"), Config.OperandB); }
+	else { DisplayName += PCGEx::GetSelectorDisplayName(Config.OperandBAttr); }
 	return DisplayName;
 }
 #endif

Source/PCGExtendedToolkit/Public/Misc/CollectionFilters/PCGExEntryCountFilter.h

@@ -8,12 +8,8 @@
 
 #include "UObject/Object.h"
 
-#include "Data/PCGExPointFilter.h"
-#include "PCGExPointsProcessor.h"
-
-
 #include "Misc/Filters/PCGExFilterFactoryProvider.h"
-
+#include "Data/PCGExPointFilter.h"
 
 #include "PCGExEntryCountFilter.generated.h"
 
@@ -31,13 +27,26 @@ struct FPCGExEntryCountFilterConfig
 	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = Settings, meta=(PCG_Overridable))
 	EPCGExComparison Comparison = EPCGExComparison::NearlyEqual;
 
+	/** Type of OperandB */
+	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = Settings, meta=(PCG_Overridable))
+	EPCGExInputValueType CompareAgainst = EPCGExInputValueType::Constant;
+
+	/** Operand B for testing -- Will be translated to `int32` under the hood. */
+	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = Settings, meta=(PCG_Overridable, DisplayName="Operand B (Attr)", EditCondition="CompareAgainst != EPCGExInputValueType::Constant", EditConditionHides))
+	FPCGAttributePropertyInputSelector OperandBAttr;
+
 	/** Operand B to test Entries count against */
-	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = Settings, meta=(PCG_Overridable, DisplayName="Operand B", ClampMin=0))
+	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = Settings, meta=(PCG_Overridable, DisplayName="Operand B", EditCondition="CompareAgainst == EPCGExInputValueType::Constant", EditConditionHides, ClampMin=0))
 	int32 OperandB = 0;
 
 	/** Rounding mode for relative measures */
 	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = Settings, meta=(PCG_Overridable, EditCondition="Comparison == EPCGExComparison::NearlyEqual || Comparison == EPCGExComparison::NearlyNotEqual", EditConditionHides))
 	double Tolerance = DBL_COMPARE_TOLERANCE;
+
+	/** What should this filter return when dealing with data that don't have the specified? */
+	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = Settings, meta = (PCG_NotOverridable, EditCondition="CompareAgainst != EPCGExInputValueType::Constant", EditConditionHides))
+	EPCGExFilterFallback MissingAttributeFallback = EPCGExFilterFallback::Fail;
+
 };