Merge branch 'v2.15-LTS' into main

# Conflicts: # com.persistant-studios.popcornfx.urp/Runtime/Assets/URP_CPUParticle_LitAlphaBlend.asset # com.persistant-studios.popcornfx.urp/Runtime/Assets/URP_CPUParticle_UnlitAlphaBlend.asset # com.persistant-studios.popcornfx.urp/Runtime/Assets/URP_CPURibbonCorrectDeformation_LitAlphaBlend.asset # com.persistant-studios.popcornfx.urp/Runtime/Assets/URP_CPURibbonCorrectDeformation_UnlitAlphaBlend.asset # com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Particle_LitAlphaBlend.shadergraph # com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Particle_UnlitAlphaBlend.shadergraph # com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_RibbonCorrectDeformation_LitAlphaBlend.shadergraph # com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_RibbonCorrectDeformation_UnlitAlphaBlend.shadergraph
PopcornFX · Dec 1, 2023 · 4f0b5ce · 4f0b5ce
2 parents 556d601 + 2e16362
commit 4f0b5ce
Show file tree

Hide file tree

Showing 58 changed files with 844 additions and 36,767 deletions.
diff --git a/Native/EditorOnly/BrowseEffect.cpp b/Native/EditorOnly/BrowseEffect.cpp
@@ -590,6 +590,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;

diff --git a/Native/EditorOnly/EditorNativeToManaged.h b/Native/EditorOnly/EditorNativeToManaged.h
@@ -29,6 +29,7 @@ extern "C"
 		};
 
 		int				m_AttributeType;
+		int				m_AttributeSemantic;
 		int				m_AttributeDropMode;
 		int				m_MinMaxFlag;
 

diff --git a/com.persistant-studios.popcornfx.hdrp/Runtime/Scripts/PKFxMaterialFactoryHDRP.cs b/com.persistant-studios.popcornfx.hdrp/Runtime/Scripts/PKFxMaterialFactoryHDRP.cs
@@ -50,7 +50,7 @@ public static PKFxMaterialFactoryHDRP CreateMaterialFactoryHDRP()
 
 			// Create the HDRP material factory asset:
 			PKFxMaterialFactoryHDRP materialFactoryHDRP = CreateInstance<PKFxMaterialFactoryHDRP>();
-
+			materialFactoryHDRP.m_FactoryType = FactoryType.HDRP;
 			materialFactoryHDRP.SetupFallBackFeatureBinding();
 
 			AssetDatabase.CreateAsset(materialFactoryHDRP, path);

diff --git a/com.persistant-studios.popcornfx.urp/Runtime/Assets/URP_CPUParticle_LitAlphaBlend.asset b/com.persistant-studios.popcornfx.urp/Runtime/Assets/URP_CPUParticle_LitAlphaBlend.asset
diff --git a/com.persistant-studios.popcornfx.urp/Runtime/Assets/URP_CPUParticle_LitAlphaBlend.asset.meta b/com.persistant-studios.popcornfx.urp/Runtime/Assets/URP_CPUParticle_LitAlphaBlend.asset.meta
diff --git a/.../Assets/URP_CPUParticle_LitAdditive.asset → ...sets/URP_CPUParticle_LitTransparent.asset b/.../Assets/URP_CPUParticle_LitAdditive.asset → ...sets/URP_CPUParticle_LitTransparent.asset
@@ -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
@@ -70,7 +70,7 @@ MonoBehaviour:
     type: 3}
   m_Material: {fileID: 0}
   m_RenderTypes: 01010001
-  m_BlendMode: 010000000000
+  m_BlendMode: 010101010000
   m_SupportedShaderMask: 4194302
   m_MandatoryShaderMask: 8
   m_BillboardingLocation: 0
diff --git a/...ts/URP_CPUParticle_LitAdditive.asset.meta → ...URP_CPUParticle_LitTransparent.asset.meta b/...ts/URP_CPUParticle_LitAdditive.asset.meta → ...URP_CPUParticle_LitTransparent.asset.meta
diff --git a/com.persistant-studios.popcornfx.urp/Runtime/Assets/URP_CPUParticle_UnlitAlphaBlend.asset b/com.persistant-studios.popcornfx.urp/Runtime/Assets/URP_CPUParticle_UnlitAlphaBlend.asset
diff --git a/...ersistant-studios.popcornfx.urp/Runtime/Assets/URP_CPUParticle_UnlitAlphaBlend.asset.meta b/...ersistant-studios.popcornfx.urp/Runtime/Assets/URP_CPUParticle_UnlitAlphaBlend.asset.meta
diff --git a/...ssets/URP_CPUParticle_UnlitAdditive.asset → ...ts/URP_CPUParticle_UnlitTransparent.asset b/...ssets/URP_CPUParticle_UnlitAdditive.asset → ...ts/URP_CPUParticle_UnlitTransparent.asset
@@ -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
@@ -70,7 +70,7 @@ MonoBehaviour:
     type: 3}
   m_Material: {fileID: 0}
   m_RenderTypes: 01010001
-  m_BlendMode: 010000000000
+  m_BlendMode: 010101010000
   m_SupportedShaderMask: 4194294
   m_MandatoryShaderMask: 0
   m_BillboardingLocation: 0
diff --git a/.../URP_CPUParticle_UnlitAdditive.asset.meta → ...P_CPUParticle_UnlitTransparent.asset.meta b/.../URP_CPUParticle_UnlitAdditive.asset.meta → ...P_CPUParticle_UnlitTransparent.asset.meta
diff --git a/...-studios.popcornfx.urp/Runtime/Assets/URP_CPURibbonCorrectDeformation_LitAlphaBlend.asset b/...-studios.popcornfx.urp/Runtime/Assets/URP_CPURibbonCorrectDeformation_LitAlphaBlend.asset
diff --git a/...ios.popcornfx.urp/Runtime/Assets/URP_CPURibbonCorrectDeformation_LitAlphaBlend.asset.meta b/...ios.popcornfx.urp/Runtime/Assets/URP_CPURibbonCorrectDeformation_LitAlphaBlend.asset.meta
diff --git a/...ibbonCorrectDeformation_LitAdditive.asset → ...onCorrectDeformation_LitTransparent.asset b/...ibbonCorrectDeformation_LitAdditive.asset → ...onCorrectDeformation_LitTransparent.asset
@@ -10,10 +10,10 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 718d0c6ed6ff2634e8a669a91e3959a9, type: 3}
-  m_Name: URP_CPURibbonCorrectDeformation_LitAdditive
+  m_Name: URP_CPURibbonCorrectDeformation_LitTransparent
   m_EditorClassIdentifier: 
-  m_SourceBlendPropertyName: _SrcBlendMode
-  m_DestinationBlendPropertyName: _DstBlendMode
+  m_SourceBlendPropertyName: _SrcBlend
+  m_DestinationBlendPropertyName: _DstBlend
   m_MaskThresholdPropertyName: _CutOutAlpha
   m_RotateUVsPropertyName: _RotateUVs
   m_DiffuseMapPropertyName: _MainTex
@@ -70,7 +70,7 @@ MonoBehaviour:
     type: 3}
   m_Material: {fileID: 0}
   m_RenderTypes: 00010000
-  m_BlendMode: 010000000000
+  m_BlendMode: 010101010000
   m_SupportedShaderMask: 4194301
   m_MandatoryShaderMask: 9
   m_BillboardingLocation: 0
diff --git a/...CorrectDeformation_LitAdditive.asset.meta → ...rectDeformation_LitTransparent.asset.meta b/...CorrectDeformation_LitAdditive.asset.meta → ...rectDeformation_LitTransparent.asset.meta