PopcornFX Plugin v2.19.3

Download_SDK_Desktop.bat

@@ -6,7 +6,7 @@ setlocal
 
 bitsadmin /reset
 bitsadmin /create third_party_download_desktop
-bitsadmin /addfile third_party_download_desktop https://downloads.popcornfx.com/Plugins/UE4/UnrealEngine_PopcornFXPlugin_2.19.2_Win64_Linux64_Mac64.7z "%~dp0\_PopcornFX_Runtime_SDK_Desktop.7z"
+bitsadmin /addfile third_party_download_desktop https://downloads.popcornfx.com/Plugins/UE4/UnrealEngine_PopcornFXPlugin_2.19.3_Win64_Linux64_Mac64.7z "%~dp0\_PopcornFX_Runtime_SDK_Desktop.7z"
 bitsadmin /setpriority third_party_download_desktop "FOREGROUND"
 bitsadmin /resume third_party_download_desktop
 

Download_SDK_Mobile.bat

@@ -6,7 +6,7 @@ setlocal
 
 bitsadmin /reset
 bitsadmin /create third_party_download_mobile
-bitsadmin /addfile third_party_download_mobile https://downloads.popcornfx.com/Plugins/UE4/UnrealEngine_PopcornFXPlugin_2.19.2_iOS_Android.7z "%~dp0\_PopcornFX_Runtime_SDK_Mobile.7z"
+bitsadmin /addfile third_party_download_mobile https://downloads.popcornfx.com/Plugins/UE4/UnrealEngine_PopcornFXPlugin_2.19.3_iOS_Android.7z "%~dp0\_PopcornFX_Runtime_SDK_Mobile.7z"
 bitsadmin /setpriority third_party_download_mobile "FOREGROUND"
 bitsadmin /resume third_party_download_mobile
 

PopcornFX.uplugin

@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
-	"Version": 21902,
-	"VersionName": "2.19.2",
+	"Version": 21903,
+	"VersionName": "2.19.3",
 	"FriendlyName": "PopcornFX",
 	"Description": "PopcornFX Realtime Particle Solution integration into Unreal Engine",
 	"Category": "PopcornFX",

README.md

@@ -1,7 +1,7 @@
 # Unreal Engine PopcornFX Plugin
 
 Integrates the **PopcornFX Runtime SDK** into **Unreal Engine 5** as a Plugin.
-* **Version:** `v2.19.2`
+* **Version:** `v2.19.3`
 * **Unreal Engine:** `5.1`, `5.2` and `5.3`
 * **Supported platforms:** `Windows`, `MacOS`, `Linux`, `iOS`, `Android`, `PS4`, `PS5`, `XboxOne`, `Xbox Series`, `Switch`
 

Source/PopcornFX/Private/Attributes/PopcornFXAttributeSamplers.cpp

@@ -638,7 +638,11 @@ namespace
 		if (!PK_VERIFY(batch->RawMesh() != null))
 			return null;
 
-		PopcornFX::CShapeDescriptor_Mesh	*shapeDesc = PK_NEW(PopcornFX::CShapeDescriptor_Mesh(batch->RawMesh()));
+		PK_ASSERT(self->Scale.GetMin() >= 0.0f);
+		const FVector3f safeMeshScale = FVector3f(self->Scale);
+		const CFloat3 scale = ToPk(safeMeshScale);
+
+		PopcornFX::CShapeDescriptor_Mesh	*shapeDesc = PK_NEW(PopcornFX::CShapeDescriptor_Mesh(batch->RawMesh(), scale));
 
 		_RebuildSamplingStructs(self, shapeDesc);
 
@@ -651,6 +655,12 @@ namespace
 	{
 		const UPopcornFXAttributeSamplerShape		*self = params.self;
 		PopcornFX::CShapeDescriptor_Mesh			*shapeDesc = static_cast<PopcornFX::CShapeDescriptor_Mesh*>(params.shape);
+
+		PK_ASSERT(self->Scale.GetMin() >= 0.0f);
+		const FVector3f	safeScale = FVector3f(self->Scale);
+		const CFloat3	scale = ToPk(safeScale);
+
+		shapeDesc->SetScale(scale);
 
 		_RebuildSamplingStructs(self, shapeDesc);
 	}
@@ -779,6 +789,7 @@ UPopcornFXAttributeSamplerShape::UPopcornFXAttributeSamplerShape(const FObjectIn
 	ShapeType = EPopcornFXAttribSamplerShapeType::Sphere;
 	BoxDimension = FVector(100.f);
 	Radius = 100.f;
+	Scale = FVector::OneVector;
 	InnerRadius = 0.f;
 	Height = 100.f;
 	StaticMesh = null;
@@ -849,6 +860,14 @@ void	UPopcornFXAttributeSamplerShape::SetHeight(float height)
 
 //----------------------------------------------------------------------------
 
+void	UPopcornFXAttributeSamplerShape::SetScale(FVector scale)
+{
+	Scale = scale;
+	UpdateShapeProperties();
+}
+
+//----------------------------------------------------------------------------
+
 PopcornFX::CMeshSurfaceSamplerStructuresRandom	*UPopcornFXAttributeSamplerShape::SamplerSurface() const
 {
 	return &m_Data->m_SamplerSurface;
@@ -908,6 +927,7 @@ void	UPopcornFXAttributeSamplerShape::PostEditChangeProperty(FPropertyChangedEve
 			propertyName == TEXT("Radius") ||
 			propertyName == TEXT("InnerRadius") ||
 			propertyName == TEXT("Height") ||
+			propertyName == TEXT("Scale") ||
 #if 0 // To re-enable when shape collections are supported by PopcornFX v2
 			propertyName == TEXT("CollectionSamplingHeuristic") ||
 			propertyName == TEXT("CollectionUseShapeWeights") ||

Source/PopcornFX/Private/Editor/CustomizeDetails/PopcornFXDetailsAttributeSamplerShape.cpp

@@ -68,6 +68,7 @@ void	FPopcornFXDetailsAttributeSamplerShape::CustomizeDetails(IDetailLayoutBuild
 			detailLayout.HideProperty("StaticMesh");
 			detailLayout.HideProperty("StaticMeshSubIndex");
 			detailLayout.HideProperty("Shapes");
+			detailLayout.HideProperty("Scale");
 #if 0 // To re-enable when shape collections are supported by PopcornFX v2
 			detailLayout.HideProperty("CollectionSamplingHeuristic");
 			detailLayout.HideProperty("CollectionUseShapeWeights");
@@ -82,6 +83,7 @@ void	FPopcornFXDetailsAttributeSamplerShape::CustomizeDetails(IDetailLayoutBuild
 			detailLayout.HideProperty("StaticMesh");
 			detailLayout.HideProperty("StaticMeshSubIndex");
 			detailLayout.HideProperty("Shapes");
+			detailLayout.HideProperty("Scale");
 #if 0 // To re-enable when shape collections are supported by PopcornFX v2
 			detailLayout.HideProperty("CollectionSamplingHeuristic");
 			detailLayout.HideProperty("CollectionUseShapeWeights");
@@ -108,6 +110,7 @@ void	FPopcornFXDetailsAttributeSamplerShape::CustomizeDetails(IDetailLayoutBuild
 			detailLayout.HideProperty("StaticMesh");
 			detailLayout.HideProperty("StaticMeshSubIndex");
 			detailLayout.HideProperty("Shapes");
+			detailLayout.HideProperty("Scale");
 #if 0 // To re-enable when shape collections are supported by PopcornFX v2
 			detailLayout.HideProperty("CollectionSamplingHeuristic");
 			detailLayout.HideProperty("CollectionUseShapeWeights");
@@ -121,6 +124,7 @@ void	FPopcornFXDetailsAttributeSamplerShape::CustomizeDetails(IDetailLayoutBuild
 			detailLayout.HideProperty("StaticMesh");
 			detailLayout.HideProperty("StaticMeshSubIndex");
 			detailLayout.HideProperty("Shapes");
+			detailLayout.HideProperty("Scale");
 #if 0 // To re-enable when shape collections are supported by PopcornFX v2
 			detailLayout.HideProperty("CollectionSamplingHeuristic");
 			detailLayout.HideProperty("CollectionUseShapeWeights");
@@ -136,6 +140,7 @@ void	FPopcornFXDetailsAttributeSamplerShape::CustomizeDetails(IDetailLayoutBuild
 			detailLayout.HideProperty("InnerRadius");
 			detailLayout.HideProperty("Height");
 			detailLayout.HideProperty("StaticMesh");
+			detailLayout.HideProperty("Scale");
 			detailLayout.HideProperty("StaticMeshSubIndex");
 			detailLayout.HideProperty("ShapeSamplingMode");
 			detailLayout.HideProperty("DensityColorChannel");

Source/PopcornFX/Private/Editor/PropertyCustomization/PopcornFXCustomizationSubRendererMaterial.cpp

@@ -254,7 +254,7 @@ FText	FPopcornFXCustomizationSubRendererMaterial::OnGetThumbnailToolTip(int32 th
 	check(thumbId >= 0 && thumbId < PK_ARRAY_COUNT(m_Thumbs));
 	if (!m_Thumbs[thumbId].m_Pty->IsValidHandle())
 		return FText::FromString(TEXT("Invalid"));
-	UObject		*obj;
+	UObject		*obj = null;
 	m_Thumbs[thumbId].m_Pty->GetValue(obj);
 	if (obj == null)
 		return FText::FromString(TEXT("null"));

Source/PopcornFX/Public/PopcornFXAttributeSamplerShape.h

@@ -53,6 +53,9 @@ class POPCORNFX_API UPopcornFXAttributeSamplerShape : public UPopcornFXAttribute
 
 	UFUNCTION(Category = "PopcornFX AttributeSampler", BlueprintCallable)
 	void					SetHeight(float height);
+
+	UFUNCTION(Category = "PopcornFX AttributeSampler", BlueprintCallable)
+	void					SetScale(FVector scale);
 public:
 	UPROPERTY(Category="PopcornFX AttributeSampler", EditAnywhere)
 	TEnumAsByte<EPopcornFXAttribSamplerShapeType::Type>		ShapeType;
@@ -75,6 +78,9 @@ class POPCORNFX_API UPopcornFXAttributeSamplerShape : public UPopcornFXAttribute
 	UPROPERTY(Category="PopcornFX AttributeSampler", EditAnywhere, BlueprintReadOnly, meta=(ClampMin = "0.0", UIMin = "0.0"))
 	float					Height;
 
+	UPROPERTY(Category="PopcornFX AttributeSampler", EditAnywhere, BlueprintReadOnly, meta=(ClampMin = "0.0", UIMin = "0.0"))
+	FVector					Scale;
+
 	/** Distribute sampling by the given CollectionSamplingHeuristic of sub-Shapes */
 	UPROPERTY(Category="PopcornFX AttributeSampler", EditAnywhere)
 	TEnumAsByte<EPopcornFXShapeCollectionSamplingHeuristic::Type>	CollectionSamplingHeuristic;

Source/PopcornFX/Public/PopcornFXVersionGenerated.h

@@ -7,5 +7,5 @@
 
 #define POPCORNFX_PLUGIN_VERSION_MAJOR 2
 #define POPCORNFX_PLUGIN_VERSION_MINOR 19
-#define POPCORNFX_PLUGIN_VERSION_PATCH 2
+#define POPCORNFX_PLUGIN_VERSION_PATCH 3
 #define POPCORNFX_PLUGIN_VERSION_TAG ""