PopcornFX Plugin v2.19.4

PopcornFX · Jun 6, 2024 · c7c8255 · c7c8255
1 parent 93c7350
commit c7c8255
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 22 deletions.
diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml
@@ -12,14 +12,8 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: jungwinter/split@master
-        id: split
-        with:
-          msg: ${{ github.ref_name }}
-          separator: "."
-
-      - name: Set environment
-        run: echo "VERSION=$(echo "${GITHUB_REF_NAME#v}" | sed 's/-LTS//g')" >> $GITHUB_ENV && echo "MINOR_VERSION=${{ steps.split.outputs._0 }}.${{ steps.split.outputs._1 }}" >> $GITHUB_ENV
+      - name: Set MINOR_VERSION
+        run: export SHORT=${GITHUB_REF_NAME%.*} && echo "MINOR_VERSION=${SHORT#v}" >> $GITHUB_ENV
 
       - uses: ncipollo/release-action@v1
         with:

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.19.3_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.4_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.19.3_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.4_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": 21903,
-	"VersionName": "2.19.3",
+	"Version": 21904,
+	"VersionName": "2.19.4",
 	"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 5** as a Plugin.
-* **Version:** `v2.19.3`
+* **Version:** `v2.19.4`
 * **Unreal Engine:** `5.1`, `5.2` and `5.3`
 * **Supported platforms:** `Windows`, `MacOS`, `Linux`, `iOS`, `Android`, `PS4`, `PS5`, `XboxOne`, `Xbox Series`, `Switch`
 

diff --git a/Source/PopcornFX/Private/Internal/ParticleScene.cpp b/Source/PopcornFX/Private/Internal/ParticleScene.cpp
@@ -1728,17 +1728,32 @@ void	CParticleScene::RayTracePacket(
 		{
 			RAYTRACE_PROFILE_CAPTURE_CYCLES_N(RayTrace_Results_Hit_Mat, 1);
 
-			const TArray<Chaos::FMaterialHandle> &fmatData = hit.Shape->GetMaterials();
-
-			if (fmatData.Num() != 0)
+			if (hit.Shape)
 			{
-				const Chaos::FChaosPhysicsMaterial *fPhyMat = fmatData[0].Get();
-				void *userData = fPhyMat->UserData;
+				const TArray<Chaos::FMaterialHandle> &fmatData = hit.Shape->GetMaterials();
+
+				if (fmatData.Num() != 0)
+				{
+					const Chaos::FChaosPhysicsMaterial *fPhyMat = fmatData[0].Get();
 
-				if (userData)
+					if (fPhyMat)
+					{
+						void* userData = fPhyMat->UserData;
+
+						if (userData)
+						{
+							UPhysicalMaterial* uPhyMat = FChaosUserData::Get<UPhysicalMaterial>(userData);
+							contactSurfaces[rayi] = uPhyMat;
+						}
+					}
+					else
+					{
+						contactSurfaces[rayi] = null;
+					}
+				}
+				else
 				{
-					UPhysicalMaterial *uPhyMat = FChaosUserData::Get<UPhysicalMaterial>(userData);
-					contactSurfaces[rayi] = uPhyMat;
+					contactSurfaces[rayi] = null;
 				}
 			}
 			else

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 19
-#define POPCORNFX_PLUGIN_VERSION_PATCH 3
+#define POPCORNFX_PLUGIN_VERSION_PATCH 4
 #define POPCORNFX_PLUGIN_VERSION_TAG ""