Skip to content

Commit

Permalink
UnityPlugin: Release 2.19.1
Browse files Browse the repository at this point in the history
  • Loading branch information
PopcornFX Bot committed Apr 4, 2024
1 parent e549cc4 commit e2fcedc
Show file tree
Hide file tree
Showing 36 changed files with 69 additions and 43 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Unity PopcornFX Plugin

Integrates the **PopcornFX Runtime SDK** into **Unity** as a Plugin.
* **Version:** `v2.19.0`
* **Version:** `v2.19.1`
* **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.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Unity PopcornFX Plugin
Integrates the **PopcornFX Runtime SDK** into **Unity** as a Plugin.
* **Version:** `v2.19.0`
* **Version:** `v2.19.1`
* **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.

Expand Down
2 changes: 1 addition & 1 deletion com.persistant-studios.popcornfx.hdrp/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Unity PopcornFX Plugin

Integrates the **PopcornFX Runtime SDK** into **Unity** as a Plugin.
* **Version:** `v2.19.0`
* **Version:** `v2.19.1`
* **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.
Expand Down
4 changes: 2 additions & 2 deletions com.persistant-studios.popcornfx.hdrp/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "com.persistant-studios.popcornfx.hdrp",
"description": "HDRP Materials for PopcornFX.",
"version": "2.19.0",
"version": "2.19.1",
"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.0"
"com.persistant-studios.popcornfx": "2.19.1"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Unity PopcornFX Plugin
Integrates the **PopcornFX Runtime SDK** into **Unity** as a Plugin.
* **Version:** `v2.19.0`
* **Version:** `v2.19.1`
* **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.

Expand Down
2 changes: 1 addition & 1 deletion com.persistant-studios.popcornfx.urp/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Unity PopcornFX Plugin

Integrates the **PopcornFX Runtime SDK** into **Unity** as a Plugin.
* **Version:** `v2.19.0`
* **Version:** `v2.19.1`
* **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.
Expand Down
4 changes: 2 additions & 2 deletions com.persistant-studios.popcornfx.urp/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "com.persistant-studios.popcornfx.urp",
"description": "URP Materials for PopcornFX.",
"version": "2.19.0",
"version": "2.19.1",
"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.0"
"com.persistant-studios.popcornfx": "2.19.1"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Unity PopcornFX Plugin
Integrates the **PopcornFX Runtime SDK** into **Unity** as a Plugin.
* **Version:** `v2.19.0`
* **Version:** `v2.19.1`
* **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.

Expand Down
2 changes: 1 addition & 1 deletion com.persistant-studios.popcornfx/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Unity PopcornFX Plugin

Integrates the **PopcornFX Runtime SDK** into **Unity** as a Plugin.
* **Version:** `v2.19.0`
* **Version:** `v2.19.1`
* **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.
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Git LFS file not shown

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Git LFS file not shown

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion com.persistant-studios.popcornfx/Runtime/Plugins/OSX.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Git LFS file not shown

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion com.persistant-studios.popcornfx/Runtime/Plugins/iOS.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Git LFS file not shown

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion com.persistant-studios.popcornfx/Runtime/Plugins/x86.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Git LFS file not shown

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Git LFS file not shown

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Git LFS file not shown

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -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.0 for " + m_UnityVersion;
public const string m_PluginVersion = "2.19.1 for " + m_UnityVersion;
public static string m_CurrentVersionString = "";
public static bool m_IsStarted = false;
public static string m_DistortionLayer = "PopcornFX_Disto";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,40 @@ public static void SetVariantCount()
if (asm != null)
{
Type[] types = asm.GetTypes();
Type ShaderGraphProjectSettingsType = null;
Type ShaderGraphPreferencesType = null;
foreach (var type in types)
{
if (type.FullName == "UnityEditor.ShaderGraph.ShaderGraphPreferences")
{
ShaderGraphPreferencesType = type;
if (type.FullName == "UnityEditor.ShaderGraph.ShaderGraphProjectSettings")
ShaderGraphProjectSettingsType = type;
if (ShaderGraphPreferencesType != null && ShaderGraphProjectSettingsType != null)
break;
}
if (ShaderGraphProjectSettingsType != null)
{
object settingInstance = ShaderGraphProjectSettingsType.BaseType.GetMethod("get_instance").Invoke(null, null);
MethodInfo[] methods = ShaderGraphProjectSettingsType.GetMethods(BindingFlags.Instance | BindingFlags.NonPublic);
MethodInfo save = null;
foreach (var method in methods)
{
if (method.Name == "GetSerializedObject")
{
SerializedObject obj = method.Invoke(settingInstance, null) as SerializedObject;
SerializedProperty prop = obj.FindProperty("shaderVariantLimit");
if (prop != null && prop.intValue < 256)
{
prop.intValue = 256;
obj.ApplyModifiedProperties();
}
}
if (method.Name == "Save")
save = method;
}
if (save != null)
save.Invoke(settingInstance, new object[] { true });

}
if (ShaderGraphPreferencesType != null)
{
Expand Down
2 changes: 1 addition & 1 deletion com.persistant-studios.popcornfx/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "com.persistant-studios.popcornfx",
"description": "PopcornFX is a 3D realtime FX Solution for Games & Interactive applications.",
"version": "2.19.0",
"version": "2.19.1",
"unity": "2019.3",
"displayName": "PopcornFX"
}
2 changes: 1 addition & 1 deletion download_3rd_party.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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.0-20576_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.1-20683_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

Expand Down
2 changes: 1 addition & 1 deletion download_3rd_party.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.0-20576_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.1-20683_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"

0 comments on commit e2fcedc

Please sign in to comment.