Skip to content

Commit

Permalink
UnityPlugin: Release 2.19.2
Browse files Browse the repository at this point in the history
  • Loading branch information
PopcornFX Bot committed Apr 18, 2024
1 parent ebb097d commit eceb340
Show file tree
Hide file tree
Showing 38 changed files with 60 additions and 46 deletions.
2 changes: 2 additions & 0 deletions Native/EditorOnly/BrowseEffect.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ struct SUnityDependencyAppendHelper
additionalUsageFlags |= SResourceDependency::UsageFlags_Image_Linear;
else if (property->m_Name == BasicRendererProperties::SID_LegacyLit_NormalMap())
additionalUsageFlags |= SResourceDependency::UsageFlags_Image_Linear;
else if (property->m_Name == BasicRendererProperties::SID_LegacyLitOpaque_NormalMap())
additionalUsageFlags |= SResourceDependency::UsageFlags_Image_Linear;
else if (property->m_Name == BasicRendererProperties::SID_AlphaRemap_AlphaMap())
additionalUsageFlags |= SResourceDependency::UsageFlags_Image_Linear;
else if (property->m_Name == BasicRendererProperties::SID_Lit_NormalMap())
Expand Down
13 changes: 12 additions & 1 deletion Native/RenderingIntegration/UnityRendererCache.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,11 @@ bool CParticleMaterialDescBillboard::InitFromRenderer(const CRendererDataBase &r
CLog::Log(PK_WARN, "Legacy Lit render feature is not supported in Unity, Please use Lit instead (in PopcornFX editor)");
}

if ((m_Flags.m_ShaderVariationFlags & ShaderVariationFlags::Has_LightingLegacyOpaque) != 0)
{
CLog::Log(PK_WARN, "Legacy Lit Opaque render feature is not supported in Unity, Please use Lit instead (in PopcornFX editor)");
}

return true;
}

Expand Down Expand Up @@ -477,6 +482,7 @@ bool CParticleMaterialDescMesh::InitFromRenderer(const CRendererDataMesh &render
//const CGuid distoColorInput = renderer.m_Declaration.FindAdditionalFieldIndex(BasicRendererProperties::SID_Distortion_Color());
const SRendererFeaturePropertyValue *lit = renderer.m_Declaration.FindProperty(BasicRendererProperties::SID_Lit());
const SRendererFeaturePropertyValue *litLegacy = renderer.m_Declaration.FindProperty(BasicRendererProperties::SID_LegacyLit());
const SRendererFeaturePropertyValue *litLegacyOpaque = renderer.m_Declaration.FindProperty(BasicRendererProperties::SID_LegacyLitOpaque());
const SRendererFeaturePropertyValue *alphaRemap = renderer.m_Declaration.FindProperty(BasicRendererProperties::SID_AlphaRemap());
const SRendererFeaturePropertyValue *alphaRemapAlphaMap = renderer.m_Declaration.FindProperty(BasicRendererProperties::SID_AlphaRemap_AlphaMap());
const CGuid alphaRemapCursor = renderer.m_Declaration.FindAdditionalFieldIndex(BasicRendererProperties::SID_AlphaRemap_Cursor());
Expand Down Expand Up @@ -511,6 +517,8 @@ bool CParticleMaterialDescMesh::InitFromRenderer(const CRendererDataMesh &render
m_Flags.m_ShaderVariationFlags |= ShaderVariationFlags::Has_Lighting;
if ((litLegacy != null && litLegacy->ValueB()))
m_Flags.m_ShaderVariationFlags |= ShaderVariationFlags::Has_LightingLegacy;
if ((litLegacyOpaque != null && litLegacyOpaque->ValueB()))
m_Flags.m_ShaderVariationFlags |= ShaderVariationFlags::Has_LightingLegacyOpaque;
if (softParticles != null && softParticles->ValueB() && softnessDistance != null && softnessDistance->ValueF().x() != 0.0f)
m_Flags.m_ShaderVariationFlags |= ShaderVariationFlags::Has_Soft;
if (atlas != null && atlas->ValueB())
Expand Down Expand Up @@ -800,7 +808,10 @@ bool CParticleMaterialDescMesh::InitFromRenderer(const CRendererDataMesh &render
//}
CLog::Log(PK_WARN, "Legacy Lit render feature is not supported in Unity, Please use Lit instead (in PopcornFX editor)");
}

if ((m_Flags.m_ShaderVariationFlags & ShaderVariationFlags::Has_LightingLegacyOpaque) != 0)
{
CLog::Log(PK_WARN, "Legacy Lit Opaque render feature is not supported in Unity, Please use Lit instead (in PopcornFX editor)");
}
return true;
}

Expand Down
3 changes: 2 additions & 1 deletion Native/RenderingIntegration/UnityRendererCache.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ namespace ShaderVariationFlags
Has_SkeletalInterpol = (1 << 20),
Has_SkeletalTrackInterpol = (1 << 21),
Has_TransformUVs = (1 << 22),
ShaderVariation_Count = 23
Has_LightingLegacyOpaque = (1 << 23),
ShaderVariation_Count = 24
};
}

Expand Down
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.1`
* **Version:** `v2.19.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.
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.1`
* **Version:** `v2.19.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.

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.1`
* **Version:** `v2.19.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.
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.1",
"version": "2.19.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.19.1"
"com.persistant-studios.popcornfx": "2.19.2"
}
}
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.1`
* **Version:** `v2.19.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.

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.1`
* **Version:** `v2.19.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.
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.1",
"version": "2.19.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.19.1"
"com.persistant-studios.popcornfx": "2.19.2"
}
}
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.1`
* **Version:** `v2.19.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.

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.1`
* **Version:** `v2.19.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.
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.1 for " + m_UnityVersion;
public const string m_PluginVersion = "2.19.2 for " + m_UnityVersion;
public static string m_CurrentVersionString = "";
public static bool m_IsStarted = false;
public static string m_DistortionLayer = "PopcornFX_Disto";
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.1",
"version": "2.19.2",
"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.1-20700_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.2-20896_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.1-20700_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.2-20896_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 eceb340

Please sign in to comment.