UnityPlugin: Release 2.19.3

PopcornFX · May 16, 2024 · a065bc4 · a065bc4
1 parent eceb340
commit a065bc4
Show file tree

Hide file tree

Showing 46 changed files with 110 additions and 451 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # Unity PopcornFX Plugin
 
 Integrates the **PopcornFX Runtime SDK** into **Unity** as a Plugin.
-* **Version:** `v2.19.2`
+* **Version:** `v2.19.3`
 * **Unity:** `2019.4` to `2022.x`
 * **Platforms:** `Windows`, `Linux`, `MacOS`, `iOS`, `Android`, `PS4`, `XboxOne`, `Switch`. 
 [Contact-us](https://www.popcornfx.com/contact-popcornfx/) to request access to the plugin for consoles.

diff --git a/com.persistant-studios.popcornfx.hdrp/Documentation~/popcornfx.hdrp.md b/com.persistant-studios.popcornfx.hdrp/Documentation~/popcornfx.hdrp.md
@@ -1,6 +1,6 @@
 # Unity PopcornFX Plugin
 Integrates the **PopcornFX Runtime SDK** into **Unity** as a Plugin.
-* **Version:** `v2.19.2`
+* **Version:** `v2.19.3`
 * **Unity:** `2019.4` to `2021.x`
 * **Platforms:** `Windows`, `Linux`, `MacOS`, `iOS`, `Android`, `PS4`, `XboxOne`, `Switch`. [Contact-us](http://www.popcornfx.com/contact-us/) for more information.
 

diff --git a/com.persistant-studios.popcornfx.hdrp/README.md b/com.persistant-studios.popcornfx.hdrp/README.md
@@ -1,7 +1,7 @@
 # Unity PopcornFX Plugin
 
 Integrates the **PopcornFX Runtime SDK** into **Unity** as a Plugin.
-* **Version:** `v2.19.2`
+* **Version:** `v2.19.3`
 * **Unity:** `2019.4` to `2022.x`
 * **Platforms:** `Windows`, `Linux`, `MacOS`, `iOS`, `Android`, `PS4`, `XboxOne`, `Switch`. 
 [Contact-us](https://www.popcornfx.com/contact-popcornfx/) to request access to the plugin for consoles.

diff --git a/com.persistant-studios.popcornfx.hdrp/package.json b/com.persistant-studios.popcornfx.hdrp/package.json
@@ -1,13 +1,13 @@
 {
   "name": "com.persistant-studios.popcornfx.hdrp",
   "description": "HDRP Materials for PopcornFX.",
-  "version": "2.19.2",
+  "version": "2.19.3",
   "unity": "2020.2",
   "unityRelease": "",
   "displayName": "PopcornFX HDRP",
   "dependencies": {
     "com.unity.render-pipelines.core": "10.2.2",
     "com.unity.render-pipelines.high-definition": "10.2.2",
-    "com.persistant-studios.popcornfx": "2.19.2"
+    "com.persistant-studios.popcornfx": "2.19.3"
   }
 }
diff --git a/com.persistant-studios.popcornfx.urp/Documentation~/popcornfx.urp.md b/com.persistant-studios.popcornfx.urp/Documentation~/popcornfx.urp.md
@@ -1,6 +1,6 @@
 # Unity PopcornFX Plugin
 Integrates the **PopcornFX Runtime SDK** into **Unity** as a Plugin.
-* **Version:** `v2.19.2`
+* **Version:** `v2.19.3`
 * **Unity:** `2017.4` to `2021.x`
 * **Platforms:** `Windows`, `Linux`, `MacOS`, `iOS`, `Android`, `PS4`, `XboxOne`, `Switch`. [Contact-us](http://www.popcornfx.com/contact-us/) for more information.
 

diff --git a/com.persistant-studios.popcornfx.urp/README.md b/com.persistant-studios.popcornfx.urp/README.md
@@ -1,7 +1,7 @@
 # Unity PopcornFX Plugin
 
 Integrates the **PopcornFX Runtime SDK** into **Unity** as a Plugin.
-* **Version:** `v2.19.2`
+* **Version:** `v2.19.3`
 * **Unity:** `2019.4` to `2022.x`
 * **Platforms:** `Windows`, `Linux`, `MacOS`, `iOS`, `Android`, `PS4`, `XboxOne`, `Switch`. 
 [Contact-us](https://www.popcornfx.com/contact-popcornfx/) to request access to the plugin for consoles.

diff --git a/com.persistant-studios.popcornfx.urp/package.json b/com.persistant-studios.popcornfx.urp/package.json
@@ -1,13 +1,13 @@
 {
   "name": "com.persistant-studios.popcornfx.urp",
   "description": "URP Materials for PopcornFX.",
-  "version": "2.19.2",
+  "version": "2.19.3",
   "unity": "2020.2",
   "unityRelease": "",
   "displayName": "PopcornFX URP",
   "dependencies": {
     "com.unity.render-pipelines.core": "10.2.2",
     "com.unity.render-pipelines.universal": "10.2.2",
-    "com.persistant-studios.popcornfx": "2.19.2"
+    "com.persistant-studios.popcornfx": "2.19.3"
   }
 }
diff --git a/com.persistant-studios.popcornfx/Documentation~/popcornfx.md b/com.persistant-studios.popcornfx/Documentation~/popcornfx.md
@@ -1,6 +1,6 @@
 # Unity PopcornFX Plugin
 Integrates the **PopcornFX Runtime SDK** into **Unity** as a Plugin.
-* **Version:** `v2.19.2`
+* **Version:** `v2.19.3`
 * **Unity:** `2017.4` to `2021.x`
 * **Platforms:** `Windows`, `Linux`, `MacOS`, `iOS`, `Android`, `PS4`, `XboxOne`, `Switch`. [Contact-us](http://www.popcornfx.com/contact-us/) for more information.
 

diff --git a/com.persistant-studios.popcornfx/Editor/Scripts/PKFxMenus.cs b/com.persistant-studios.popcornfx/Editor/Scripts/PKFxMenus.cs
@@ -580,6 +580,7 @@ static void _DeleteUnusedPKFxFXMaterials(MenuCommand menuCommand)
 					deleteCount++;
 				}
 			}
+			AssetDatabase.SaveAssets();
 			Debug.Log("[PopcornFX] " + deleteCount + " unused PKFx material deleted.");
 		}
 

diff --git a/com.persistant-studios.popcornfx/README.md b/com.persistant-studios.popcornfx/README.md
@@ -1,7 +1,7 @@
 # Unity PopcornFX Plugin
 
 Integrates the **PopcornFX Runtime SDK** into **Unity** as a Plugin.
-* **Version:** `v2.19.2`
+* **Version:** `v2.19.3`
 * **Unity:** `2019.4` to `2022.x`
 * **Platforms:** `Windows`, `Linux`, `MacOS`, `iOS`, `Android`, `PS4`, `XboxOne`, `Switch`. 
 [Contact-us](https://www.popcornfx.com/contact-popcornfx/) to request access to the plugin for consoles.

diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/ARM64.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/ARM64.meta
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/Android.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/Android.meta
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/Android/libPK-UnityPlugin.so b/com.persistant-studios.popcornfx/Runtime/Plugins/Android/libPK-UnityPlugin.so
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/Android/libPK-UnityPlugin.so.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/Android/libPK-UnityPlugin.so.meta
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/Android64.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/Android64.meta
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/Android64/libPK-UnityPlugin.so b/com.persistant-studios.popcornfx/Runtime/Plugins/Android64/libPK-UnityPlugin.so
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/Android64/libPK-UnityPlugin.so.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/Android64/libPK-UnityPlugin.so.meta
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/OSX.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/OSX.meta
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/OSX/libPK-UnityPlugin.dylib b/com.persistant-studios.popcornfx/Runtime/Plugins/OSX/libPK-UnityPlugin.dylib
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/OSX/libPK-UnityPlugin.dylib.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/OSX/libPK-UnityPlugin.dylib.meta
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/iOS.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/iOS.meta
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/ios64.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/ios64.meta
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/libPK-UnityPlugin.a b/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/libPK-UnityPlugin.a
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/libPK-UnityPlugin.a.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/libPK-UnityPlugin.a.meta
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/x86.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/x86.meta
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/x86/PK-UnityPlugin.dll b/com.persistant-studios.popcornfx/Runtime/Plugins/x86/PK-UnityPlugin.dll
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/x86/PK-UnityPlugin.dll.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/x86/PK-UnityPlugin.dll.meta
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64.meta
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/PK-UnityPlugin.dll b/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/PK-UnityPlugin.dll
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/PK-UnityPlugin.dll.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/PK-UnityPlugin.dll.meta
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/libPK-UnityPlugin.so b/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/libPK-UnityPlugin.so
diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/libPK-UnityPlugin.so.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/libPK-UnityPlugin.so.meta
diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxManagedToNative.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxManagedToNative.cs
@@ -377,7 +377,7 @@ internal partial class PKFxManagerImpl : object
 		//----------------------------------------------------------------------------
 
 		private const string m_UnityVersion = "Unity 2019.4 and up";
-		public const string m_PluginVersion = "2.19.2 for " + m_UnityVersion;
+		public const string m_PluginVersion = "2.19.3 for " + m_UnityVersion;
 		public static string m_CurrentVersionString = "";
 		public static bool		m_IsStarted = false;
 		public static string	m_DistortionLayer = "PopcornFX_Disto";

diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxAssetCreationUtils.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxAssetCreationUtils.cs
@@ -390,6 +390,7 @@ private static void ApplyPKImportSetting(PKFxEffectAsset.DependencyDesc dependen
 				ModelImporter modelImporter = assetImporter as ModelImporter;
 
 				modelImporter.isReadable = true;
+				modelImporter.sortHierarchyByName = false;
 				modelImporter.bakeAxisConversion = true;
 				modelImporter.SaveAndReimport();
 			}

diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxEffectAsset.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxEffectAsset.cs
@@ -401,7 +401,10 @@ public void AddRenderer(ERendererType type, SPopcornRendererDesc renderer, int i
 				mat = curMat.m_CustomMaterial;
 			}
 			else
+			{
 				mat = PKFxSettings.MaterialFactory.EditorResolveMaterial(batch, this, false, false, false);
+				AssetDatabase.SaveAssets();
+			}
 
 			if (mat == null)
 			{
@@ -432,7 +435,10 @@ public void AddRenderer(ERendererType type, SMeshRendererDesc renderer, int idx)
 				mat = curMat.m_CustomMaterial;
 			}
 			else
+			{
 				mat = PKFxSettings.MaterialFactory.EditorResolveMaterial(batch, this, false, false, false);
+				AssetDatabase.SaveAssets();
+			}
 
 			if (mat == null)
 			{

diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxMaterialFactory.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxMaterialFactory.cs
@@ -232,7 +232,6 @@ public Material EditorResolveMaterial(SBatchDesc batchDesc, PKFxEffectAsset asse
 				binding.SetMaterialKeywords(batchDesc, material);
 				binding.BindMaterialProperties(batchDesc, material, asset, logError);
 			}
-			AssetDatabase.SaveAssets();
 			return material;
 		}
 #endif

diff --git a/com.persistant-studios.popcornfx/package.json b/com.persistant-studios.popcornfx/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.persistant-studios.popcornfx",
   "description": "PopcornFX is a 3D realtime FX Solution for Games & Interactive applications.",
-  "version": "2.19.2",
+  "version": "2.19.3",
   "unity": "2019.3",
   "displayName": "PopcornFX"
 }
diff --git a/download_3rd_party.bat b/download_3rd_party.bat
@@ -7,7 +7,7 @@ set OPEN_SOURCE_UNITY_REPO_PATH=%~dp0
 
 bitsadmin /reset
 bitsadmin /create third_party_download
-bitsadmin /addfile third_party_download http://downloads.popcornfx.com/Plugins/ExternalLibs/ExternalLibs_UnityStore_2.19.2-20896_android_android64_arm64_ios64_x32_x64_android_ios_linux_macosx_vs2019.zip "%OPEN_SOURCE_UNITY_REPO_PATH%ExternalLibs.zip"
+bitsadmin /addfile third_party_download http://downloads.popcornfx.com/Plugins/ExternalLibs/ExternalLibs_UnityStore_2.19.3-21095_android_android64_arm64_ios64_x32_x64_android_ios_linux_macosx_vs2019.zip "%OPEN_SOURCE_UNITY_REPO_PATH%ExternalLibs.zip"
 bitsadmin /setpriority third_party_download "FOREGROUND"
 bitsadmin /resume third_party_download
 

diff --git a/download_3rd_party.sh b/download_3rd_party.sh
@@ -4,6 +4,6 @@ SCRIPT_PATH=$(readlink -f "$0")
 OPEN_SOURCE_UNITY_REPO_PATH=$(dirname "$SCRIPT_PATH")
 
 rm -rf "$OPEN_SOURCE_UNITY_REPO_PATH/ExternalLibs"
-wget "http://downloads.popcornfx.com/Plugins/ExternalLibs/ExternalLibs_UnityStore_2.19.2-20896_android_android64_arm64_ios64_x32_x64_android_ios_linux_macosx_vs2019.zip" -O "$OPEN_SOURCE_UNITY_REPO_PATH/ExternalLibs.zip"
+wget "http://downloads.popcornfx.com/Plugins/ExternalLibs/ExternalLibs_UnityStore_2.19.3-21095_android_android64_arm64_ios64_x32_x64_android_ios_linux_macosx_vs2019.zip" -O "$OPEN_SOURCE_UNITY_REPO_PATH/ExternalLibs.zip"
 unzip "$OPEN_SOURCE_UNITY_REPO_PATH/ExternalLibs.zip"
 rm -f "$OPEN_SOURCE_UNITY_REPO_PATH/ExternalLibs.zip"
diff --git a/projects/UnityStore_android/PK-RHI_SDK1.make b/projects/UnityStore_android/PK-RHI_SDK1.make
@@ -171,7 +171,7 @@ OBJECTS += $(OBJDIR)/glew.o
 all: $(TARGET)
 	@:
 
-$(TARGET): $(OBJECTS) $(LDDEPS) | $(TARGETDIR)
+$(TARGET): $(GENERATED) $(OBJECTS) $(LDDEPS) | $(TARGETDIR)
 	$(PRELINKCMDS)
 	@echo Linking PK-RHI_SDK1
 	$(SILENT) $(LINKCMD)
-Original file line number
+Diff line change
@@ Expand Up @@
     					deleteCount++;
     				}
     			}
+    			AssetDatabase.SaveAssets();
     			Debug.Log("[PopcornFX] " + deleteCount + " unused PKFx material deleted.");
     		}
@@ Expand Down @@