From 7324b26f7b1ac4f4e2428790baaddec90ac24211 Mon Sep 17 00:00:00 2001 From: PopcornFX Bot Date: Mon, 7 Oct 2024 16:05:20 +0200 Subject: [PATCH] UnityPlugin: Release 2.20.2 --- README.md | 2 +- .../Documentation~/popcornfx.hdrp.md | 2 +- .../README.md | 2 +- .../package.json | 4 +- .../Documentation~/popcornfx.urp.md | 2 +- .../README.md | 2 +- .../package.json | 4 +- .../Documentation~/popcornfx.md | 2 +- com.persistant-studios.popcornfx/README.md | 2 +- .../Runtime/Plugins/ARM64.meta | 2 +- .../Runtime/Plugins/Android.meta | 2 +- .../Plugins/Android/libPK-UnityPlugin.so | 4 +- .../Plugins/Android/libPK-UnityPlugin.so.meta | 2 +- .../Runtime/Plugins/Android64.meta | 2 +- .../Plugins/Android64/libPK-UnityPlugin.so | 4 +- .../Android64/libPK-UnityPlugin.so.meta | 2 +- .../Runtime/Plugins/OSX.meta | 2 +- .../Plugins/OSX/libPK-UnityPlugin.dylib | 4 +- .../Plugins/OSX/libPK-UnityPlugin.dylib.meta | 2 +- .../Runtime/Plugins/iOS.meta | 2 +- .../Runtime/Plugins/iOS/ios64.meta | 2 +- .../Runtime/Plugins/iOS/libPK-UnityPlugin.a | 4 +- .../Plugins/iOS/libPK-UnityPlugin.a.meta | 2 +- .../Runtime/Plugins/x86.meta | 2 +- .../Runtime/Plugins/x86/PK-UnityPlugin.dll | 4 +- .../Plugins/x86/PK-UnityPlugin.dll.meta | 2 +- .../Runtime/Plugins/x86_64.meta | 2 +- .../Runtime/Plugins/x86_64/PK-UnityPlugin.dll | 4 +- .../Plugins/x86_64/PK-UnityPlugin.dll.meta | 2 +- .../Plugins/x86_64/libPK-UnityPlugin.so | 4 +- .../Plugins/x86_64/libPK-UnityPlugin.so.meta | 2 +- .../Runtime/Scripts/Components/PKFxCamera.cs | 49 +++++++++++++++++-- .../Scripts/Components/PKFxRenderingPlugin.cs | 3 +- .../Scripts/Internal/PKFxManagedToNative.cs | 2 +- com.persistant-studios.popcornfx/package.json | 2 +- download_3rd_party.bat | 2 +- download_3rd_party.sh | 2 +- .../PK-IntegrationUnity.vcxproj | 8 +-- 38 files changed, 96 insertions(+), 52 deletions(-) diff --git a/README.md b/README.md index 737a4b8..016d641 100644 --- 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.20.1` +* **Version:** `v2.20.2` * **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 index 2f5e3a2..4f1c61b 100644 --- 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.20.1` +* **Version:** `v2.20.2` * **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 index 737a4b8..016d641 100644 --- 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.20.1` +* **Version:** `v2.20.2` * **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 index fb73659..17f0850 100644 --- 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.20.1", + "version": "2.20.2", "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.20.1" + "com.persistant-studios.popcornfx": "2.20.2" } } diff --git a/com.persistant-studios.popcornfx.urp/Documentation~/popcornfx.urp.md b/com.persistant-studios.popcornfx.urp/Documentation~/popcornfx.urp.md index 68fdeb4..d9c16fd 100644 --- 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.20.1` +* **Version:** `v2.20.2` * **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 index 737a4b8..016d641 100644 --- 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.20.1` +* **Version:** `v2.20.2` * **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 index 976e24e..9381312 100644 --- 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.20.1", + "version": "2.20.2", "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.20.1" + "com.persistant-studios.popcornfx": "2.20.2" } } diff --git a/com.persistant-studios.popcornfx/Documentation~/popcornfx.md b/com.persistant-studios.popcornfx/Documentation~/popcornfx.md index 68fdeb4..d9c16fd 100644 --- 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.20.1` +* **Version:** `v2.20.2` * **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/README.md b/com.persistant-studios.popcornfx/README.md index 737a4b8..016d641 100644 --- 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.20.1` +* **Version:** `v2.20.2` * **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 index 43a3aae..d8cbb7c 100644 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/ARM64.meta +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/ARM64.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 25e808d606384072b690e63e11032490 +guid: 8a6c4b2c499d467da08bb0b7e2f3697e folderAsset: yes DefaultImporter: diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/Android.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/Android.meta index b63932a..f45895c 100644 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/Android.meta +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/Android.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f027fc4e156448e187dd3bef9d84e647 +guid: 68cde216cc9841dba438246c2dcdba1c folderAsset: yes DefaultImporter: diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/Android/libPK-UnityPlugin.so b/com.persistant-studios.popcornfx/Runtime/Plugins/Android/libPK-UnityPlugin.so index a708c53..44b1855 100755 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/Android/libPK-UnityPlugin.so +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/Android/libPK-UnityPlugin.so @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9076d701487df62179d197f4de36b0e7e73f084e58114d2ca164321927e7abc9 -size 180435236 +oid sha256:7043c6976f2f09731d7b5ab20f9fcc04f5fc6e6ada1c38de07c0dc4e04aed219 +size 180414564 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 index c2f4889..cbde0ea 100644 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/Android/libPK-UnityPlugin.so.meta +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/Android/libPK-UnityPlugin.so.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0443be27b22046e09918c522ce889182 +guid: 6a87f7a1f21e4051847bc946cc73a7ec PluginImporter: serializedVersion: 2 isPreloaded: 0 diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/Android64.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/Android64.meta index 510d3c3..2104f43 100644 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/Android64.meta +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/Android64.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b0bf892543e74d56b8184313fb27a11f +guid: 84f8681e4e0441b7b31faae5b1a9212f folderAsset: yes DefaultImporter: diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/Android64/libPK-UnityPlugin.so b/com.persistant-studios.popcornfx/Runtime/Plugins/Android64/libPK-UnityPlugin.so index da3a10c..fb779b7 100755 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/Android64/libPK-UnityPlugin.so +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/Android64/libPK-UnityPlugin.so @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be7d249bd64337f64fdeb462cbf39b020617b6505b36a49a88253f83c00ddaec -size 141680512 +oid sha256:b43f74217a24fd21438b4308c65bac6e18781f2e157bd102b27fd2a61d476f90 +size 141519552 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 index 89bb228..ded0adb 100644 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/Android64/libPK-UnityPlugin.so.meta +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/Android64/libPK-UnityPlugin.so.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 25c4114289e646bfb6506b43f8c20148 +guid: 8e43fe8f115e4d3ebc3a344046c6b3f9 PluginImporter: serializedVersion: 2 isPreloaded: 0 diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/OSX.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/OSX.meta index ee3d5fc..2b58c86 100644 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/OSX.meta +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/OSX.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9a5d56a826c44241b34ae53b6b35af7a +guid: 678a572ea555496f979ec08c77f999c9 folderAsset: yes DefaultImporter: diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/OSX/libPK-UnityPlugin.dylib b/com.persistant-studios.popcornfx/Runtime/Plugins/OSX/libPK-UnityPlugin.dylib index 36dab21..c9ca19e 100755 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/OSX/libPK-UnityPlugin.dylib +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/OSX/libPK-UnityPlugin.dylib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:533461da549a8995d02261d8a3b08a92d15c70040b3061641a5a171964f2ad47 -size 70822705 +oid sha256:08f7c97aa96d9cad393b85cc871df0d839cf2ab61645d14e1e99c5ea676d3b18 +size 70840129 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 index e925fda..cd0f7c2 100644 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/OSX/libPK-UnityPlugin.dylib.meta +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/OSX/libPK-UnityPlugin.dylib.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 73ad0f2c692442e8bc9817bd575434fb +guid: f4e75fccf7414b9b80db662c6de85668 PluginImporter: serializedVersion: 2 isPreloaded: 0 diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/iOS.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/iOS.meta index ac30478..25f718f 100644 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/iOS.meta +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/iOS.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 59a3b07c165e463aa81b225c80f4b049 +guid: 402060f1380347d4b370f10ae32d86ff folderAsset: yes DefaultImporter: diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/ios64.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/ios64.meta index f12ba38..e96756e 100644 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/ios64.meta +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/ios64.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e130a734da344f8ab0f8ec9a119d5b1b +guid: a1f53ccfa35544d7b856f7354ef7a6d1 folderAsset: yes DefaultImporter: diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/libPK-UnityPlugin.a b/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/libPK-UnityPlugin.a index 7c53d0b..8a59329 100644 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/libPK-UnityPlugin.a +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/libPK-UnityPlugin.a @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1884e1eda4aca88c1bc2cde7230f59253ba9cdb9cb16904b3b76a27074b9c93 -size 187035168 +oid sha256:15f4957010ba8af244d863cf5b8e2372be1cacb1932abb371c5c18c5f83fc356 +size 187056440 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 index 18684fd..c1aba2c 100644 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/libPK-UnityPlugin.a.meta +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/libPK-UnityPlugin.a.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 66aa21f4f3134006acb0101f64b6e7ac +guid: aa6e751c30e84adeb0f583013beaa69a PluginImporter: serializedVersion: 2 isPreloaded: 0 diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/x86.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/x86.meta index 9acd3b4..e4bc5ef 100644 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/x86.meta +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/x86.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cac14954fd954bb3b47e9a38c45b9868 +guid: 02406e305cce41a890c62c615d684f80 folderAsset: yes DefaultImporter: diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/x86/PK-UnityPlugin.dll b/com.persistant-studios.popcornfx/Runtime/Plugins/x86/PK-UnityPlugin.dll index c06bc92..442a2c6 100644 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/x86/PK-UnityPlugin.dll +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/x86/PK-UnityPlugin.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5214ba9fbb9d2fd7c4c2d8c65a44a5ceda9515d56cef4ac57b27f955294028c0 -size 4920320 +oid sha256:be250aa9a7074b6671efdc55351f5fb3e0c5fe73bff5634e948be3f4cdcbe6e4 +size 4934656 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 index 9de697f..7fc6de0 100644 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/x86/PK-UnityPlugin.dll.meta +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/x86/PK-UnityPlugin.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6e4b301ee91a4683b749e30ce8a8a29e +guid: f488f8d681db4f2aae60658ae03167bc PluginImporter: serializedVersion: 2 isPreloaded: 0 diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64.meta index 9ba083f..afc11bf 100644 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64.meta +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: edb814ed1a4745dd872b0f3075b90349 +guid: cbce78d8ef5a4a9388d4f1c51b63c963 folderAsset: yes DefaultImporter: 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 index bc11edf..c529142 100644 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/PK-UnityPlugin.dll +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/PK-UnityPlugin.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:32c773a19b9661d4efddbb66af6b34e57688b29bfc05bf76af408048dabf6534 -size 24689664 +oid sha256:5c57e065d1f810248aa574ec0ee3262fb5ae87611ea55f3825b41c676d9d0e2a +size 24680960 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 index 4580be7..e43bfac 100644 --- 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 @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7399d2dca3994d6ab4ed326e0303c406 +guid: 6b29cd85b609461bb8884bbbecfa2a7b PluginImporter: serializedVersion: 2 isPreloaded: 0 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 index 1c52d10..5740356 100755 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/libPK-UnityPlugin.so +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/libPK-UnityPlugin.so @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0f5245298eaf72b057d192b30c0a31924c51bb16be242472be066036bdc479e -size 22446632 +oid sha256:57948392c4ff27ce630972b2784b56a44f178737fa62821181f158e10061d50d +size 22442536 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 index 38e1eaf..141aee9 100644 --- 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 @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5d836ee5f9f048ffa284e4e682f3aa2b +guid: e1050097577c47e38cbf2e6ec223bd05 PluginImporter: serializedVersion: 2 isPreloaded: 0 diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxCamera.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxCamera.cs index 6f01a19..eb66e47 100644 --- a/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxCamera.cs +++ b/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxCamera.cs @@ -125,6 +125,10 @@ public void OnDestroy() if (m_CameraID >= 0) m_RenderingPlugin.UnRegisterCamera(this); Clean(); +#if UNITY_EDITOR + if (m_IsEditorCamera) + SceneView.lastActiveSceneViewChanged -= OnSceneChanged; +#endif } public void OnEnable() @@ -156,9 +160,10 @@ void Awake() #if UNITY_EDITOR if (GetComponent() != null) { - m_Camera = SceneView.lastActiveSceneView.camera; + SceneView.lastActiveSceneViewChanged += OnSceneChanged; m_IsEditorCamera = true; - m_EditorCameraOriginMask = m_Camera.cullingMask; + m_EditorCameraOriginMask = Tools.visibleLayers; + _SetEditorCamera(SceneView.lastActiveSceneView); } else #endif @@ -205,7 +210,7 @@ void Awake() } #endif //Enable depth texture on mobile - if (PKFxSettings.EnableSoftParticles) + if (PKFxSettings.EnableSoftParticles && m_Camera != null) m_Camera.depthTextureMode = DepthTextureMode.Depth; m_EnableDistortion = PKFxSettings.EnableDistortion; @@ -214,6 +219,9 @@ void Awake() internal void SetCullingMask(short ID, LayerMask targetMask, LayerMask allPKMask) { + if (m_Camera == null) + return; + m_CurrentCameraID = ID; int cull = m_Camera.cullingMask;// << Origin Mask cull = (cull & (~allPKMask)) | targetMask; @@ -240,6 +248,37 @@ internal void SetCullingMask(short ID, LayerMask targetMask, LayerMask allPKMask //---------------------------------------------------------------------------- #if UNITY_EDITOR + private void _SetEditorCamera(SceneView sceneView) + { + // Unregister old camera + if (m_RenderingPlugin != null && m_Camera != null) + { + if (m_CameraID >= 0 && m_RenderingPlugin != null) + m_RenderingPlugin.UnRegisterCamera(this); + } + + if (sceneView == null) + m_Camera = null; + else + m_Camera = sceneView.camera; + + // Register new camera + if (m_RenderingPlugin != null && m_Camera != null) + { + int id = m_RenderingPlugin.RegisterCamera(this); + if (id >= 0) + m_CameraID = (short)id; + } + } + + //---------------------------------------------------------------------------- + public void OnSceneChanged(SceneView oldScene, SceneView newScene) + { + Clean(); + _SetEditorCamera(newScene); + } + + //---------------------------------------------------------------------------- public void ResetEditorCameraMask() { Tools.visibleLayers = m_EditorCameraOriginMask; @@ -305,6 +344,10 @@ void UpdateProjectionMatrix(bool isVR = false, Camera.StereoscopicEye eye = Came public void UpdateCamera() { m_CurrentFrameID++; + + if (m_Camera == null) + return; + UpdateFrame(); if (m_EnableDistortion || m_EnableBlur) diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxRenderingPlugin.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxRenderingPlugin.cs index b1cb79a..2da53ee 100644 --- a/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxRenderingPlugin.cs +++ b/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxRenderingPlugin.cs @@ -358,9 +358,10 @@ public bool UpdateCameraLayerIFN() else newCameraLayers[i] = PKFxSettings.Instance.GetCameraLayer(i); } - CameraLayers = newCameraLayers; + CameraLayers = newCameraLayers; // UpdateLayerMask will be called in the setter return true; } + UpdateLayerMask(); return false; } diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxManagedToNative.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxManagedToNative.cs index a97d409..72af6fd 100644 --- a/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxManagedToNative.cs +++ b/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxManagedToNative.cs @@ -399,7 +399,7 @@ internal partial class PKFxManagerImpl : object //---------------------------------------------------------------------------- private const string m_UnityVersion = "Unity 2019.4 and up"; - public const string m_PluginVersion = "2.20.1 for " + m_UnityVersion; + public const string m_PluginVersion = "2.20.2 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/package.json b/com.persistant-studios.popcornfx/package.json index e9b2747..e9c5069 100644 --- 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.20.1", + "version": "2.20.2", "unity": "2019.3", "displayName": "PopcornFX" } diff --git a/download_3rd_party.bat b/download_3rd_party.bat index 86508c9..6a2ba0a 100644 --- 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.20.1-21982_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.20.2-22062_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 index db02cc3..fb9428b 100644 --- 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.20.1-21982_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.20.2-22062_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_vs2019/PK-IntegrationUnity.vcxproj b/projects/UnityStore_vs2019/PK-IntegrationUnity.vcxproj index a7a422d..54df99d 100644 --- a/projects/UnityStore_vs2019/PK-IntegrationUnity.vcxproj +++ b/projects/UnityStore_vs2019/PK-IntegrationUnity.vcxproj @@ -118,7 +118,7 @@ Level4 4701;4512;%(DisableSpecificWarnings) 4002;4003;%(TreatSpecificWarningsAsErrors) - _DEBUG;_CRT_SECURE_NO_WARNINGS;Z_PREFIX;Z_PREFIX_CUSTOM=pk_z_;PK_USE_RENDER_HELPERS=1;PK_BUILD_WITH_VULKAN_SUPPORT=1;PK_BUILD_WITH_D3D11_SUPPORT=1;PK_BUILD_WITH_D3D12_SUPPORT=0;PK_BUILD_WITH_GLES_SUPPORT=0;PK_BUILD_WITH_GLES3_SUPPORT=0;PK_BUILD_WITH_METAL_SUPPORT=0;PK_BUILD_WITH_GNM_SUPPORT=0;PK_BUILD_WITH_AGC_SUPPORT=0;PK_BUILD_WITH_GL_SUPPORT=1;PK_BUILD_WITH_NVN_SUPPORT=0;PK_PRINTF_TO_CLOG;PK_SAMPLE_USES_WINMAIN;GLEW_STATIC;GL_GLEXT_PROTOTYPES;PKFX_PLUGIN_EXPORT;PK_UNITY_EXPORT;PK_UNITY_EDITOR=0;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) + _DEBUG;_CRT_SECURE_NO_WARNINGS;Z_PREFIX;Z_PREFIX_CUSTOM=pk_z_;PK_USE_RENDER_HELPERS=1;PK_BUILD_WITH_VULKAN_SUPPORT=1;PK_BUILD_WITH_D3D11_SUPPORT=1;PK_BUILD_WITH_D3D12_SUPPORT=1;PK_BUILD_WITH_GLES_SUPPORT=0;PK_BUILD_WITH_GLES3_SUPPORT=0;PK_BUILD_WITH_METAL_SUPPORT=0;PK_BUILD_WITH_GNM_SUPPORT=0;PK_BUILD_WITH_AGC_SUPPORT=0;PK_BUILD_WITH_GL_SUPPORT=1;PK_BUILD_WITH_NVN_SUPPORT=0;PK_PRINTF_TO_CLOG;PK_SAMPLE_USES_WINMAIN;GLEW_STATIC;GL_GLEXT_PROTOTYPES;PKFX_PLUGIN_EXPORT;PK_UNITY_EXPORT;PK_UNITY_EDITOR=0;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) ..\..\ExternalLibs\Runtime;..\..\ExternalLibs\Runtime\include;..\..\ExternalLibs\Runtime\include\license\UnityStore;..\..\ExternalLibs;..\..\Native;..\..\Native\precompiled;..\..\Native\Common\PKFX;..\..\ExternalLibs\pk_upgraderlib\include;..\..\Native\Common\Gl;..\..\Native\Common\GLES;..\..\ExternalLibs\GL\include;$(VULKAN_SDK)\include;..\..\Native\Common\DXUT11\Core;..\..\Native\Common\DXUT11\Optional;..\..\ExternalLibs\Runtime\libs\zlib-1.2.8;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -151,7 +151,7 @@ Level4 4701;4512;%(DisableSpecificWarnings) 4002;4003;%(TreatSpecificWarningsAsErrors) - _DEBUG;_CRT_SECURE_NO_WARNINGS;Z_PREFIX;Z_PREFIX_CUSTOM=pk_z_;PK_USE_RENDER_HELPERS=1;PK_BUILD_WITH_VULKAN_SUPPORT=1;PK_BUILD_WITH_D3D11_SUPPORT=1;PK_BUILD_WITH_D3D12_SUPPORT=0;PK_BUILD_WITH_GLES_SUPPORT=0;PK_BUILD_WITH_GLES3_SUPPORT=0;PK_BUILD_WITH_METAL_SUPPORT=0;PK_BUILD_WITH_GNM_SUPPORT=0;PK_BUILD_WITH_AGC_SUPPORT=0;PK_BUILD_WITH_GL_SUPPORT=1;PK_BUILD_WITH_NVN_SUPPORT=0;PK_PRINTF_TO_CLOG;PK_SAMPLE_USES_WINMAIN;GLEW_STATIC;GL_GLEXT_PROTOTYPES;PKFX_PLUGIN_EXPORT;PK_UNITY_EXPORT;PK_UNITY_EDITOR=1;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) + _DEBUG;_CRT_SECURE_NO_WARNINGS;Z_PREFIX;Z_PREFIX_CUSTOM=pk_z_;PK_USE_RENDER_HELPERS=1;PK_BUILD_WITH_VULKAN_SUPPORT=1;PK_BUILD_WITH_D3D11_SUPPORT=1;PK_BUILD_WITH_D3D12_SUPPORT=1;PK_BUILD_WITH_GLES_SUPPORT=0;PK_BUILD_WITH_GLES3_SUPPORT=0;PK_BUILD_WITH_METAL_SUPPORT=0;PK_BUILD_WITH_GNM_SUPPORT=0;PK_BUILD_WITH_AGC_SUPPORT=0;PK_BUILD_WITH_GL_SUPPORT=1;PK_BUILD_WITH_NVN_SUPPORT=0;PK_PRINTF_TO_CLOG;PK_SAMPLE_USES_WINMAIN;GLEW_STATIC;GL_GLEXT_PROTOTYPES;PKFX_PLUGIN_EXPORT;PK_UNITY_EXPORT;PK_UNITY_EDITOR=1;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) ..\..\ExternalLibs\Runtime;..\..\ExternalLibs\Runtime\include;..\..\ExternalLibs\Runtime\include\license\UnityStore;..\..\ExternalLibs;..\..\Native;..\..\Native\precompiled;..\..\Native\Common\PKFX;..\..\ExternalLibs\pk_upgraderlib\include;..\..\Native\Common\Gl;..\..\Native\Common\GLES;..\..\ExternalLibs\GL\include;$(VULKAN_SDK)\include;..\..\Native\Common\DXUT11\Core;..\..\Native\Common\DXUT11\Optional;..\..\ExternalLibs\Runtime\libs\zlib-1.2.8;%(AdditionalIncludeDirectories) ProgramDatabase Disabled @@ -179,7 +179,7 @@ Level4 4701;4512;%(DisableSpecificWarnings) 4002;4003;%(TreatSpecificWarningsAsErrors) - NDEBUG;_CRT_SECURE_NO_WARNINGS;Z_PREFIX;Z_PREFIX_CUSTOM=pk_z_;PK_USE_RENDER_HELPERS=1;PK_BUILD_WITH_VULKAN_SUPPORT=1;PK_BUILD_WITH_D3D11_SUPPORT=1;PK_BUILD_WITH_D3D12_SUPPORT=0;PK_BUILD_WITH_GLES_SUPPORT=0;PK_BUILD_WITH_GLES3_SUPPORT=0;PK_BUILD_WITH_METAL_SUPPORT=0;PK_BUILD_WITH_GNM_SUPPORT=0;PK_BUILD_WITH_AGC_SUPPORT=0;PK_BUILD_WITH_GL_SUPPORT=1;PK_BUILD_WITH_NVN_SUPPORT=0;PK_PRINTF_TO_CLOG;PK_SAMPLE_USES_WINMAIN;GLEW_STATIC;GL_GLEXT_PROTOTYPES;PKFX_PLUGIN_EXPORT;PK_UNITY_EXPORT;PK_UNITY_EDITOR=0;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) + NDEBUG;_CRT_SECURE_NO_WARNINGS;Z_PREFIX;Z_PREFIX_CUSTOM=pk_z_;PK_USE_RENDER_HELPERS=1;PK_BUILD_WITH_VULKAN_SUPPORT=1;PK_BUILD_WITH_D3D11_SUPPORT=1;PK_BUILD_WITH_D3D12_SUPPORT=1;PK_BUILD_WITH_GLES_SUPPORT=0;PK_BUILD_WITH_GLES3_SUPPORT=0;PK_BUILD_WITH_METAL_SUPPORT=0;PK_BUILD_WITH_GNM_SUPPORT=0;PK_BUILD_WITH_AGC_SUPPORT=0;PK_BUILD_WITH_GL_SUPPORT=1;PK_BUILD_WITH_NVN_SUPPORT=0;PK_PRINTF_TO_CLOG;PK_SAMPLE_USES_WINMAIN;GLEW_STATIC;GL_GLEXT_PROTOTYPES;PKFX_PLUGIN_EXPORT;PK_UNITY_EXPORT;PK_UNITY_EDITOR=0;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) ..\..\ExternalLibs\Runtime;..\..\ExternalLibs\Runtime\include;..\..\ExternalLibs\Runtime\include\license\UnityStore;..\..\ExternalLibs;..\..\Native;..\..\Native\precompiled;..\..\Native\Common\PKFX;..\..\ExternalLibs\pk_upgraderlib\include;..\..\Native\Common\Gl;..\..\Native\Common\GLES;..\..\ExternalLibs\GL\include;$(VULKAN_SDK)\include;..\..\Native\Common\DXUT11\Core;..\..\Native\Common\DXUT11\Optional;..\..\ExternalLibs\Runtime\libs\zlib-1.2.8;%(AdditionalIncludeDirectories) ProgramDatabase Full @@ -218,7 +218,7 @@ Level4 4701;4512;%(DisableSpecificWarnings) 4002;4003;%(TreatSpecificWarningsAsErrors) - NDEBUG;_CRT_SECURE_NO_WARNINGS;Z_PREFIX;Z_PREFIX_CUSTOM=pk_z_;PK_USE_RENDER_HELPERS=1;PK_BUILD_WITH_VULKAN_SUPPORT=1;PK_BUILD_WITH_D3D11_SUPPORT=1;PK_BUILD_WITH_D3D12_SUPPORT=0;PK_BUILD_WITH_GLES_SUPPORT=0;PK_BUILD_WITH_GLES3_SUPPORT=0;PK_BUILD_WITH_METAL_SUPPORT=0;PK_BUILD_WITH_GNM_SUPPORT=0;PK_BUILD_WITH_AGC_SUPPORT=0;PK_BUILD_WITH_GL_SUPPORT=1;PK_BUILD_WITH_NVN_SUPPORT=0;PK_PRINTF_TO_CLOG;PK_SAMPLE_USES_WINMAIN;GLEW_STATIC;GL_GLEXT_PROTOTYPES;PKFX_PLUGIN_EXPORT;PK_UNITY_EXPORT;PK_UNITY_EDITOR=1;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) + NDEBUG;_CRT_SECURE_NO_WARNINGS;Z_PREFIX;Z_PREFIX_CUSTOM=pk_z_;PK_USE_RENDER_HELPERS=1;PK_BUILD_WITH_VULKAN_SUPPORT=1;PK_BUILD_WITH_D3D11_SUPPORT=1;PK_BUILD_WITH_D3D12_SUPPORT=1;PK_BUILD_WITH_GLES_SUPPORT=0;PK_BUILD_WITH_GLES3_SUPPORT=0;PK_BUILD_WITH_METAL_SUPPORT=0;PK_BUILD_WITH_GNM_SUPPORT=0;PK_BUILD_WITH_AGC_SUPPORT=0;PK_BUILD_WITH_GL_SUPPORT=1;PK_BUILD_WITH_NVN_SUPPORT=0;PK_PRINTF_TO_CLOG;PK_SAMPLE_USES_WINMAIN;GLEW_STATIC;GL_GLEXT_PROTOTYPES;PKFX_PLUGIN_EXPORT;PK_UNITY_EXPORT;PK_UNITY_EDITOR=1;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) ..\..\ExternalLibs\Runtime;..\..\ExternalLibs\Runtime\include;..\..\ExternalLibs\Runtime\include\license\UnityStore;..\..\ExternalLibs;..\..\Native;..\..\Native\precompiled;..\..\Native\Common\PKFX;..\..\ExternalLibs\pk_upgraderlib\include;..\..\Native\Common\Gl;..\..\Native\Common\GLES;..\..\ExternalLibs\GL\include;$(VULKAN_SDK)\include;..\..\Native\Common\DXUT11\Core;..\..\Native\Common\DXUT11\Optional;..\..\ExternalLibs\Runtime\libs\zlib-1.2.8;%(AdditionalIncludeDirectories) ProgramDatabase Full