Skip to content

Commit

Permalink
UnityPlugin: Release 2.15.16
Browse files Browse the repository at this point in the history
  • Loading branch information
PopcornFX Bot committed Nov 30, 2023
1 parent 14cd8f3 commit 2e16362
Show file tree
Hide file tree
Showing 85 changed files with 992 additions and 35,261 deletions.
1 change: 1 addition & 0 deletions Native/EditorOnly/BrowseEffect.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,7 @@ bool CEffectBrowser::BrowseAttributes(const CParticleAttributeList::_TypeOfAttri
SFxAttributeDesc attribDesc;

attribDesc.m_AttributeType = attrib->ExportedType();
attribDesc.m_AttributeSemantic = attrib->Semantic();
attribDesc.m_MinMaxFlag = 0x00;
if (attrib->HasMin())
attribDesc.m_MinMaxFlag |= SFxAttributeDesc::EAttrDescFlag::HasMin;
Expand Down
1 change: 1 addition & 0 deletions Native/EditorOnly/EditorNativeToManaged.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ extern "C"
};

int m_AttributeType;
int m_AttributeSemantic;
int m_AttributeDropMode;
int m_MinMaxFlag;

Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
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.15.15`
* **Version:** `v2.15.16`
* **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
2 changes: 1 addition & 1 deletion com.persistant-studios.popcornfx.hdrp/Documentation~/popcornfx.hdrp.md
View file
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.15.15`
* **Version:** `v2.15.16`
* **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
View file
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.15.15`
* **Version:** `v2.15.16`
* **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
2 changes: 1 addition & 1 deletion com.persistant-studios.popcornfx.hdrp/Runtime/Scripts/PKFxMaterialFactoryHDRP.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ static void CreateMaterialFactoryHDRP()

// Create the HDRP material factory asset:
PKFxMaterialFactoryHDRP materialFactoryHDRP = CreateInstance<PKFxMaterialFactoryHDRP>();

materialFactoryHDRP.m_FactoryType = FactoryType.HDRP;
materialFactoryHDRP.SetupFallBackFeatureBinding();

AssetDatabase.CreateAsset(materialFactoryHDRP, path);
Expand Down
4 changes: 2 additions & 2 deletions com.persistant-studios.popcornfx.hdrp/package.json
View file
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.15.15",
"version": "2.15.16",
"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.15.15"
"com.persistant-studios.popcornfx": "2.15.16"
}
}
2 changes: 1 addition & 1 deletion com.persistant-studios.popcornfx.urp/Documentation~/popcornfx.urp.md
View file
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.15.15`
* **Version:** `v2.15.16`
* **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
View file
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.15.15`
* **Version:** `v2.15.16`
* **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
71 changes: 0 additions & 71 deletions com.persistant-studios.popcornfx.urp/Runtime/Assets/URP_CPUParticle_LitAlphaBlend.asset
View file

This file was deleted.

8 changes: 0 additions & 8 deletions com.persistant-studios.popcornfx.urp/Runtime/Assets/URP_CPUParticle_LitAlphaBlend.asset.meta
View file

This file was deleted.

6 changes: 5 additions & 1 deletion com.persistant-studios.popcornfx.urp/Runtime/Assets/URP_CPUParticle_LitOpaque.asset
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ MonoBehaviour:
m_MeshDiffuseColorPropertyName: _BaseColor
m_MeshEmissiveColorPropertyName: _EmissiveColor
m_MeshAlphaCursorPropertyName: _AlphaCursor
m_MeshCullPropertyName: _Cull
m_MeshVATCursorPropertyName: _VATCursor
m_VATPositionMapPropertyName: _VATPositionMap
m_VATNormalMapPropertyName: _VATNormalMap
Expand Down Expand Up @@ -60,8 +61,11 @@ MonoBehaviour:
m_MeshTransformRow1PropertyName: _SkeletalMeshTransform1
m_MeshTransformRow2PropertyName: _SkeletalMeshTransform2
m_MeshTransformRow3PropertyName: _SkeletalMeshTransform3
m_TextureAtlasPropertyName: _AtlasRects
m_AtlasCountPropertyName: _AtlasCount
m_AtlasIdPropertyName: _AtlasId
m_UseShader: 1
m_Shader: {fileID: -6465566751694194690, guid: 392f00dc7d6c9e647b1527f0fae3c0f4,
m_Shader: {fileID: -6465566751694194690, guid: cbac7cfd865053146aad35732676ed21,
type: 3}
m_Material: {fileID: 0}
m_RenderTypes: 01010001
Expand Down
14 changes: 9 additions & 5 deletions .../Assets/URP_CPUParticle_LitAdditive.asset → ...sets/URP_CPUParticle_LitTransparent.asset
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 718d0c6ed6ff2634e8a669a91e3959a9, type: 3}
m_Name: URP_CPUParticle_LitAdditive
m_Name: URP_CPUParticle_LitTransparent
m_EditorClassIdentifier:
m_SourceBlendPropertyName: _SrcBlendMode
m_DestinationBlendPropertyName: _DstBlendMode
m_SourceBlendPropertyName: _SrcBlend
m_DestinationBlendPropertyName: _DstBlend
m_MaskThresholdPropertyName: _CutOutAlpha
m_RotateUVsPropertyName: _RotateUVs
m_DiffuseMapPropertyName: _MainTex
Expand All @@ -30,6 +30,7 @@ MonoBehaviour:
m_MeshDiffuseColorPropertyName: _BaseColor
m_MeshEmissiveColorPropertyName: _EmissiveColor
m_MeshAlphaCursorPropertyName: _AlphaCursor
m_MeshCullPropertyName: _Cull
m_MeshVATCursorPropertyName: _VATCursor
m_VATPositionMapPropertyName: _VATPositionMap
m_VATNormalMapPropertyName: _VATNormalMap
Expand Down Expand Up @@ -60,12 +61,15 @@ MonoBehaviour:
m_MeshTransformRow1PropertyName: _SkeletalMeshTransform1
m_MeshTransformRow2PropertyName: _SkeletalMeshTransform2
m_MeshTransformRow3PropertyName: _SkeletalMeshTransform3
m_TextureAtlasPropertyName: _AtlasRects
m_AtlasCountPropertyName: _AtlasCount
m_AtlasIdPropertyName: _AtlasId
m_UseShader: 1
m_Shader: {fileID: -6465566751694194690, guid: 585ddcbcc9dceac4bb3730d610f7d421,
m_Shader: {fileID: -6465566751694194690, guid: 68fb51c98bac3934aa9c05b1c4f33346,
type: 3}
m_Material: {fileID: 0}
m_RenderTypes: 01010001
m_BlendMode: 010000000000
m_BlendMode: 010101010000
m_SupportedShaderMask: 4194302
m_MandatoryShaderMask: 8
m_BillboardingLocation: 0
0 ...ts/URP_CPUParticle_LitAdditive.asset.meta → ...URP_CPUParticle_LitTransparent.asset.meta
View file
File renamed without changes.
71 changes: 0 additions & 71 deletions com.persistant-studios.popcornfx.urp/Runtime/Assets/URP_CPUParticle_UnlitAlphaBlend.asset
View file

This file was deleted.

8 changes: 0 additions & 8 deletions ...ersistant-studios.popcornfx.urp/Runtime/Assets/URP_CPUParticle_UnlitAlphaBlend.asset.meta
View file

This file was deleted.

12 changes: 8 additions & 4 deletions ...ssets/URP_CPUParticle_UnlitAdditive.asset → ...ts/URP_CPUParticle_UnlitTransparent.asset
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 718d0c6ed6ff2634e8a669a91e3959a9, type: 3}
m_Name: URP_CPUParticle_UnlitAdditive
m_Name: URP_CPUParticle_UnlitTransparent
m_EditorClassIdentifier:
m_SourceBlendPropertyName: _SrcBlendMode
m_DestinationBlendPropertyName: _DstBlendMode
m_SourceBlendPropertyName: _SrcBlend
m_DestinationBlendPropertyName: _DstBlend
m_MaskThresholdPropertyName: _CutOutAlpha
m_RotateUVsPropertyName: _RotateUVs
m_DiffuseMapPropertyName: _MainTex
Expand All @@ -30,6 +30,7 @@ MonoBehaviour:
m_MeshDiffuseColorPropertyName: _BaseColor
m_MeshEmissiveColorPropertyName: _EmissiveColor
m_MeshAlphaCursorPropertyName: _AlphaCursor
m_MeshCullPropertyName: _Cull
m_MeshVATCursorPropertyName: _VATCursor
m_VATPositionMapPropertyName: _VATPositionMap
m_VATNormalMapPropertyName: _VATNormalMap
Expand Down Expand Up @@ -60,12 +61,15 @@ MonoBehaviour:
m_MeshTransformRow1PropertyName: _SkeletalMeshTransform1
m_MeshTransformRow2PropertyName: _SkeletalMeshTransform2
m_MeshTransformRow3PropertyName: _SkeletalMeshTransform3
m_TextureAtlasPropertyName: _AtlasRects
m_AtlasCountPropertyName: _AtlasCount
m_AtlasIdPropertyName: _AtlasId
m_UseShader: 1
m_Shader: {fileID: -6465566751694194690, guid: 607e915b86eb0444e8ffe55cfad5faca,
type: 3}
m_Material: {fileID: 0}
m_RenderTypes: 01010001
m_BlendMode: 010000000000
m_BlendMode: 010101010000
m_SupportedShaderMask: 4194294
m_MandatoryShaderMask: 0
m_BillboardingLocation: 0
0 .../URP_CPUParticle_UnlitAdditive.asset.meta → ...P_CPUParticle_UnlitTransparent.asset.meta
View file
File renamed without changes.
Loading

0 comments on commit 2e16362

Please sign in to comment.