PopcornFX Plugin v2.12.2

PopcornFX · Apr 28, 2022 · 249dcae · 249dcae
1 parent ad486a3
commit 249dcae
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 11 deletions.
diff --git a/Download_SDK_Desktop.bat b/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.12.1_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.12.2_Win64_Linux64_Mac64.7z "%~dp0\_PopcornFX_Runtime_SDK_Desktop.7z"
 bitsadmin /setpriority third_party_download_desktop "FOREGROUND"
 bitsadmin /resume third_party_download_desktop
 

diff --git a/Download_SDK_Mobile.bat b/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.12.1_iOS_Android.7z "%~dp0\_PopcornFX_Runtime_SDK_Mobile.7z"
+bitsadmin /addfile third_party_download_mobile https://downloads.popcornfx.com/Plugins/UE4/UnrealEngine_PopcornFXPlugin_2.12.2_iOS_Android.7z "%~dp0\_PopcornFX_Runtime_SDK_Mobile.7z"
 bitsadmin /setpriority third_party_download_mobile "FOREGROUND"
 bitsadmin /resume third_party_download_mobile
 

diff --git a/PopcornFX.uplugin b/PopcornFX.uplugin
@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
-	"Version": 21201,
-	"VersionName": "2.12.1",
+	"Version": 21202,
+	"VersionName": "2.12.2",
 	"FriendlyName": "PopcornFX",
 	"Description": "PopcornFX Realtime Particle Solution integration into Unreal Engine",
 	"Category": "PopcornFX",

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # Unreal Engine PopcornFX Plugin
 
 Integrates the **PopcornFX Runtime SDK** into **Unreal Engine 4** and **Unreal Engine 5** as a Plugin.
-* **Version:** `v2.12.1`
+* **Version:** `v2.12.2`
 * **Unreal Engine:** `4.26` to `4.27` and `5.0`
 * **Supported platforms:** `Windows`, `MacOS`, `Linux`, `iOS`, `Android`, `PS4`, `PS5`, `XboxOne`, `Xbox Series`, `Switch`
 

diff --git a/Source/PopcornFX/Private/Attributes/PopcornFXAttributeSamplers.cpp b/Source/PopcornFX/Private/Attributes/PopcornFXAttributeSamplers.cpp
@@ -3053,10 +3053,6 @@ void	UPopcornFXAttributeSamplerAnimTrack::PostEditChangeProperty(FPropertyChange
 
 bool	UPopcornFXAttributeSamplerAnimTrack::RebuildCurvesIFN()
 {
-#if (ENGINE_MAJOR_VERSION == 5)
-	// Not implemented for now, see if UE5.0 keeps LWC when it comes out of preview for spline positions when shipping or if this is a miss.
-	return false;
-#else
 	USplineComponent	*splineComponent = ResolveSplineComponent(true);
 	if (splineComponent == null)
 		return false;
@@ -3119,6 +3115,15 @@ bool	UPopcornFXAttributeSamplerAnimTrack::RebuildCurvesIFN()
 			const FInterpCurvePoint<FVector>	*srcPoints = positions.Points.GetData();
 			for (u32 iPoint = 0; iPoint < keyCount; ++iPoint)
 			{
+#if (ENGINE_MAJOR_VERSION == 5)
+				const CFloat3	pos = ToPk(srcPoints->OutVal) * invGlobalScale;
+				const CFloat3	srcArriveTan = ToPk(srcPoints->ArriveTangent) * invGlobalScale;
+				const CFloat3	srcLeaveTan = ToPk(srcPoints->LeaveTangent) * invGlobalScale;
+
+				*dstPos++ = pos;
+				*dstTangents++ = srcArriveTan;
+				*dstTangents++ = srcLeaveTan;
+#else
 				VectorRegister	srcPos = VectorLoadFloat3(&srcPoints->OutVal);
 				VectorRegister	srcArriveTan = VectorLoadFloat3(&srcPoints->ArriveTangent);
 				VectorRegister	srcLeaveTan = VectorLoadFloat3(&srcPoints->LeaveTangent);
@@ -3130,6 +3135,7 @@ bool	UPopcornFXAttributeSamplerAnimTrack::RebuildCurvesIFN()
 				VectorStore(pos, dstPos++);
 				VectorStore(arriveTangent, dstTangents++);
 				VectorStore(leaveTangent, dstTangents++);
+#endif // (ENGINE_MAJOR_VERSION == 5)
 				++srcPoints;
 			}
 			// Duplicate first and last values
@@ -3197,7 +3203,6 @@ bool	UPopcornFXAttributeSamplerAnimTrack::RebuildCurvesIFN()
 	if (bScale)
 		transformFlags |= PopcornFX::CParticleSamplerDescriptor_AnimTrack::Transform_Scale;
 	return m_Data->m_Desc->Setup(splineComponent, transformFlags);
-#endif // (ENGINE_MAJOR_VERSION == 5)
 }
 
 //----------------------------------------------------------------------------

diff --git a/Source/PopcornFX/Public/PopcornFXVersionGenerated.h b/Source/PopcornFX/Public/PopcornFXVersionGenerated.h
@@ -7,5 +7,5 @@
 
 #define POPCORNFX_PLUGIN_VERSION_MAJOR 2
 #define POPCORNFX_PLUGIN_VERSION_MINOR 12
-#define POPCORNFX_PLUGIN_VERSION_PATCH 1
+#define POPCORNFX_PLUGIN_VERSION_PATCH 2
 #define POPCORNFX_PLUGIN_VERSION_TAG ""