From 40929b7a0c658f81d3b500c676cf973ba27e888e Mon Sep 17 00:00:00 2001 From: PopcornFX Bot Date: Thu, 25 Jul 2024 13:31:50 +0200 Subject: [PATCH] UnityPlugin: Release 2.19.6 --- Native/EditorOnly/AssetBaker.cpp | 25 +- Native/EditorOnly/AssetBaker.h | 2 + Native/EditorOnly/BrowseEffect.cpp | 49 +- Native/ImplemGraphicsAPI/RenderAPI_Data.cpp | 9 +- .../UnityBillboardingBatchPolicy.cpp | 22 +- README.md | 2 +- .../Documentation~/popcornfx.hdrp.md | 2 +- .../README.md | 2 +- .../package.json | 4 +- .../Documentation~/popcornfx.urp.md | 2 +- .../README.md | 2 +- .../Materials/URP_Mesh_LitOpaque.shadergraph | 1524 ++++++++++------ .../URP_Mesh_LitTransparent.shadergraph | 1622 +++++++++++------ .../URP_Mesh_UnlitOpaque.shadergraph | 958 +++++++--- .../URP_Mesh_UnlitTransparent.shadergraph | 636 +++++-- .../Materials/URP_ParticleShader.shader | 1 + .../URP_ParticleShader_CutOutOpaque.shader | 1 + .../URP_Particle_LitOpaque.shadergraph | 30 + .../URP_Particle_LitTransparent.shadergraph | 30 + .../URP_Particle_UnlitOpaque.shadergraph | 30 + .../URP_Particle_UnlitTransparent.shadergraph | 34 +- .../package.json | 4 +- .../Documentation~/popcornfx.md | 2 +- .../Editor/Scripts/PKFxFXEditor.cs | 9 + com.persistant-studios.popcornfx/README.md | 2 +- .../CustomFunctions/SwizzleVertexInputs.cginc | 13 +- .../CustomFunctions/TransformUvs.cginc | 19 +- .../PKFxShaderCode/FragmentShader.cginc | 18 +- .../PKFxShaderCode/VertexInput.cginc | 6 +- .../PKFxShaderCode/VertexShader.cginc | 5 +- .../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 +- .../Scripts/Internal/PKFxManagedToNative.cs | 2 +- .../Scripts/Internal/PKFxNativeToManaged.cs | 52 +- .../Scripts/PKFxAssets/PKFxEffectAsset.cs | 1 + .../Scripts/PKFxAssets/PKFxSettings.cs | 74 +- .../PKFxAssets/PKFxShaderInputBindings.cs | 8 +- .../PKFxRendererDescription.cs | 4 +- .../PKFxMaterialFactory/PKFxTextureUtils.cs | 105 +- com.persistant-studios.popcornfx/package.json | 2 +- download_3rd_party.bat | 2 +- download_3rd_party.sh | 2 +- .../PK-IntegrationUnity.make | 8 +- 63 files changed, 3516 insertions(+), 1867 deletions(-) diff --git a/Native/EditorOnly/AssetBaker.cpp b/Native/EditorOnly/AssetBaker.cpp index 0e319646..69765256 100644 --- a/Native/EditorOnly/AssetBaker.cpp +++ b/Native/EditorOnly/AssetBaker.cpp @@ -356,9 +356,20 @@ CEffectBaker::~CEffectBaker() { } + +bool CEffectBaker::IsPathOnIgnorePath(const CString &path) const +{ + for (const CString &Ignoredpath : m_IgnoredPaths) + { + if (path.StartsWith(Ignoredpath)) + return true; + } + return false; +} + //---------------------------------------------------------------------------- -void CEffectBaker::FileAdded(const CString &path) +void CEffectBaker::FileAdded(const CString &path) { if (path.EndsWith(".pkfx") == true) { @@ -368,6 +379,9 @@ void CEffectBaker::FileAdded(const CString &path) return; CString cleanPath = path.Extract(m_PKPackPath.SlashAppended().Length(), path.Length()); CFilePath::Purify(cleanPath); + + if (IsPathOnIgnorePath(cleanPath)) + return; effect.m_EffectPath = cleanPath; effect.m_Type = EAssetChangesType::Add; effect.m_Try = 0; @@ -390,6 +404,8 @@ void CEffectBaker::FileRemoved(const CString &path) return; CString cleanPath = path.Extract(m_PKPackPath.SlashAppended().Length(), path.Length()); CFilePath::Purify(cleanPath); + if (IsPathOnIgnorePath(cleanPath)) + return; effect.m_EffectPath = cleanPath; effect.m_Type = EAssetChangesType::Remove; @@ -411,6 +427,8 @@ void CEffectBaker::FileChanged(const CString &path) return; CString cleanPath = path.Extract(m_PKPackPath.SlashAppended().Length(), path.Length()); CFilePath::Purify(cleanPath); + if (IsPathOnIgnorePath(cleanPath)) + return; CEffectBaker::FileChangedRelativePath(cleanPath); } @@ -448,6 +466,8 @@ void CEffectBaker::FileRenamed(const CString &oldPath, const CString &newPath) CString cleanOldPath = oldPath.Extract(m_PKPackPath.SlashAppended().Length(), oldPath.Length()); CFilePath::Purify(cleanPath); + if (IsPathOnIgnorePath(cleanPath)) + return; effect.m_EffectPath = cleanPath; effect.m_EffectPathOld = cleanOldPath; effect.m_Type = EAssetChangesType::Rename; @@ -502,8 +522,11 @@ void CEffectBaker::Initialize(const char *pKPackPath, const char *targetPlatfo m_ProjectSettings->ApplyGlobalSettings(); PProjectSettingsGeneral general = m_ProjectSettings->General(); + PProjectSettingsAssets asset = m_ProjectSettings->Assets(); const CString relRoot = general->RootDir(); + const CString ignoredPath = asset->IgnoredPaths(); + ignoredPath.Split(';', m_IgnoredPaths); m_PKPackPath = relRoot.Compare(".") ? CString(pKPackPath) : CString(pKPackPath) + "/" + relRoot; m_PKSourcePack = m_BakeContext.m_BakeFSController->MountPack(m_PKPackPath); diff --git a/Native/EditorOnly/AssetBaker.h b/Native/EditorOnly/AssetBaker.h index 3b1f9094..345b70b7 100644 --- a/Native/EditorOnly/AssetBaker.h +++ b/Native/EditorOnly/AssetBaker.h @@ -95,6 +95,7 @@ class CEffectBaker : public CRefCountedObject CEffectBaker(); ~CEffectBaker(); + bool IsPathOnIgnorePath(const CString &path) const; void FileAdded(const CString &path); void FileRemoved(const CString &path); void FileChanged(const CString &path); @@ -136,6 +137,7 @@ class CEffectBaker : public CRefCountedObject private: const int m_MaxBakeRetry = 5; + TArray m_IgnoredPaths; TArray m_ToProcess; TArray m_ToBake; CString m_PKPackPath; diff --git a/Native/EditorOnly/BrowseEffect.cpp b/Native/EditorOnly/BrowseEffect.cpp index 9289d840..c6ffec94 100644 --- a/Native/EditorOnly/BrowseEffect.cpp +++ b/Native/EditorOnly/BrowseEffect.cpp @@ -83,6 +83,20 @@ static CString PatchPathForAnimTrack(const CString &path) return patchedPath; } +static CString PatchPathForMeshSampler(const CString &path) +{ + CString patchedPath; + + if (path.EndsWith(".fbx", CaseInsensitive)) + { + patchedPath = path.Extract(0, path.Length() - 4); + patchedPath += ".pkmm"; + } + else + patchedPath = path; + return patchedPath; +} + struct SUnityDependencyAppendHelper { TArray *m_OutListUnique; @@ -315,6 +329,8 @@ bool CEffectBrowser::LoadAndBrowseEffect(void *pkfxContentPtr, int contentByteSi bool CEffectBrowser::BrowseEffect(const PParticleEffect &particleEffect, PBaseObjectFile &file, bool browseAttributes, bool &requiresGameThreadCollect) { + if (!PK_VERIFY(particleEffect != null)) + return false; TArray dependencies; SUnityDependencyAppendHelper dependenciesAppend(dependencies); @@ -335,25 +351,21 @@ bool CEffectBrowser::BrowseEffect(const PParticleEffect &particleEffect, PBaseOb if (!BrowseRenderers(particleEffect.Get(), file.Get(), requiresGameThreadCollect)) return false; - if (!BrowseExportedEvents(particleEffect.Get())) - return false; - if (browseAttributes) { - if (PK_VERIFY(particleEffect != null)) - { - const CParticleAttributeList *allAttribList = particleEffect->AttributeFlatList(); + if (!BrowseExportedEvents(particleEffect.Get())) + return false; - if (allAttribList != null) - { - CParticleAttributeList::_TypeOfAttributeList attributeList = allAttribList->AttributeList(); - CParticleAttributeList::_TypeOfSamplerList samplerList = allAttribList->SamplerList(); - const TMemoryView attributeRemapIDs = allAttribList->UniqueAttributeIDs(); + const CParticleAttributeList *allAttribList = particleEffect->AttributeFlatList(); + if (allAttribList != null) + { + CParticleAttributeList::_TypeOfAttributeList attributeList = allAttribList->AttributeList(); + CParticleAttributeList::_TypeOfSamplerList samplerList = allAttribList->SamplerList(); + const TMemoryView attributeRemapIDs = allAttribList->UniqueAttributeIDs(); - if (!BrowseAttributes(attributeList, attributeRemapIDs) || - !BrowseSamplers(samplerList)) - return false; - } + if (!BrowseAttributes(attributeList, attributeRemapIDs) || + !BrowseSamplers(samplerList)) + return false; } } return true; @@ -402,6 +414,7 @@ bool CEffectBrowser::BrowseObjectForDependencies(TArray &de if (dependency.m_Type == SResourceDependency::Type_Mesh) // && (dependency.m_Usage & SResourceDependency::UsageFlags_Mesh_Sample)) { dependencyMask |= IsMeshSampler; + path = PatchPathForMeshSampler(path); } else if (dependency.m_Type == SResourceDependency::Type_Image && ((dependency.m_Usage & SResourceDependency::UsageFlags_Image_Values) || @@ -411,7 +424,7 @@ bool CEffectBrowser::BrowseObjectForDependencies(TArray &de } else if (dependency.m_Type == SResourceDependency::Type_AnimTrack) { - path = PatchPathForAnimTrack(path); // GOOD + path = PatchPathForAnimTrack(path); } ::OnEffectDependencyFound(path.Data(), dependencyMask); } @@ -596,7 +609,7 @@ bool CEffectBrowser::BrowseAttributes(const CParticleAttributeList::_TypeOfAttri u32 declId = remapIds[i]; // We register the attributes in the order they are in the attribute container const CParticleAttributeDeclaration *attrib = attributeList[declId].Get(); - if (attrib != null) + if (attrib != null && !attrib->IsPrivate()) { SFxAttributeDesc attribDesc; @@ -665,7 +678,7 @@ bool CEffectBrowser::BrowseSamplers(const CParticleAttributeList::_TypeOfSampler { const CParticleAttributeSamplerDeclaration *sampler = samplerList[i].Get(); - if (sampler != null) + if (sampler != null && !sampler->IsPrivate()) { CResourceDescriptor *samplerData = sampler->AttribSamplerDefaultValue(); SFxSamplerDesc samplerDesc; diff --git a/Native/ImplemGraphicsAPI/RenderAPI_Data.cpp b/Native/ImplemGraphicsAPI/RenderAPI_Data.cpp index cf0d3c5a..75a6d3a6 100644 --- a/Native/ImplemGraphicsAPI/RenderAPI_Data.cpp +++ b/Native/ImplemGraphicsAPI/RenderAPI_Data.cpp @@ -136,7 +136,7 @@ SFlagsToUseSemantic flagsToUseSemantic[__Semantic_Count] = { 0U, ShaderVariationFlags::Has_CorrectDeformation }, // Semantic_UvScaleAndOffset { ShaderVariationFlags::Has_CorrectDeformation, ShaderVariationFlags::Has_DiffuseMap | ShaderVariationFlags::Has_DistortionMap }, // Semantic_Uv0 { 0U, ShaderVariationFlags::Has_AnimBlend }, // Semantic_Uv1 - { 0U, ShaderVariationFlags::Has_AnimBlend }, // Semantic_AtlasId + { 0U, ShaderVariationFlags::Has_AnimBlend | ShaderVariationFlags::Has_TransformUVs }, // Semantic_AtlasId { 0U, ShaderVariationFlags::Has_AlphaRemap }, // Semantic_AlphaCursor { 0U, ShaderVariationFlags::Has_Emissive }, // Semantic_EmissiveColor { 0U, ShaderVariationFlags::Has_TransformUVs }, // Semantic_TransformUvsRotate @@ -311,7 +311,12 @@ u32 FillOffsetTableAndGetVertexBufferStride(u32 offsetTable[__Semantic_Count], u (shaderVariationFlags & ShaderVariationFlags::Has_AnimBlend) == 0) { offsetTable[Semantic_TransformUVsRotate] = vertexOffset; - vertexOffset += semanticSize[Semantic_TransformUVsRotate] + sizeof(float);// Padding; + vertexOffset += semanticSize[Semantic_TransformUVsRotate]; + if ((shaderVariationFlags & ShaderVariationFlags::Has_Atlas) != 0) + { + offsetTable[Semantic_AtlasId] = vertexOffset; + vertexOffset += semanticSize[Semantic_AtlasId]; + } } offsetTable[Semantic_TransformUVsScaleAndOffset] = vertexOffset; vertexOffset += semanticSize[Semantic_TransformUVsScaleAndOffset]; diff --git a/Native/RenderingIntegration/UnityBillboardingBatchPolicy.cpp b/Native/RenderingIntegration/UnityBillboardingBatchPolicy.cpp index 29e0b338..84ebf0f4 100644 --- a/Native/RenderingIntegration/UnityBillboardingBatchPolicy.cpp +++ b/Native/RenderingIntegration/UnityBillboardingBatchPolicy.cpp @@ -1200,13 +1200,14 @@ bool CUnityBillboardingBatchPolicy::_RenderThread_AllocBillboardingBuffers(const m_ParticleBuffers.m_TexCoords0.ResizeIFN(Drawers::GenInput_UV0, genInputs.m_GeneratedInputs, m_ParticleBuffers.m_GeneratedInputs, m_VertexCount); m_ParticleBuffers.m_TexCoords1.ResizeIFN(Drawers::GenInput_UV1, genInputs.m_GeneratedInputs, m_ParticleBuffers.m_GeneratedInputs, m_VertexCount); - m_ParticleBuffers.m_AtlasId.ResizeIFN(Drawers::GenInput_AtlasId, genInputs.m_GeneratedInputs, m_ParticleBuffers.m_GeneratedInputs, m_VertexCount); m_ParticleBuffers.m_UVRemap.ResizeIFN(Drawers::GenInput_UVRemap, genInputs.m_GeneratedInputs, m_ParticleBuffers.m_GeneratedInputs, m_VertexCount); if (_FindAdditionalInput(BasicRendererProperties::SID_Diffuse_Color(), BaseType_Float4, genInputs)) - m_ParticleBuffers.m_Colors.ResizeIFN(m_VertexCount); + m_ParticleBuffers.m_Colors.ResizeIFN(m_VertexCount); + if (_FindAdditionalInput(BasicRendererProperties::SID_Atlas_TextureID(), BaseType_Float, genInputs)) + m_ParticleBuffers.m_AtlasId.ResizeIFN(m_VertexCount); if (_FindAdditionalInput(BasicRendererProperties::SID_Emissive_EmissiveColor(), BaseType_Float3, genInputs)) - m_ParticleBuffers.m_EmissiveColors.ResizeIFN(m_VertexCount); + m_ParticleBuffers.m_EmissiveColors.ResizeIFN(m_VertexCount); if (_FindAdditionalInput(BasicRendererProperties::SID_AlphaRemap_Cursor(), BaseType_Float, genInputs)) m_ParticleBuffers.m_AlphaCursor.ResizeIFN(m_VertexCount); @@ -1308,6 +1309,17 @@ bool CUnityBillboardingBatchPolicy::_RenderThread_SetupBuffersBillboards(const S field.m_Storage.m_RawDataPtr = (u8*)m_ParticleBuffers.m_Colors.m_Ptr; field.m_Storage.m_Stride = sizeof(CFloat4); } + else if (addInput.m_Name == BasicRendererProperties::SID_Atlas_TextureID() && addInput.m_Type == BaseType_Float) + { + if (!PK_VERIFY(m_ParticleBuffers.m_AdditionalFieldsBuffers.PushBack().Valid())) + return false; + Drawers::SCopyFieldDesc &field = m_ParticleBuffers.m_AdditionalFieldsBuffers.Last(); + field.m_AdditionalInputIndex = i; + + field.m_Storage.m_Count = m_VertexCount; + field.m_Storage.m_RawDataPtr = (u8 *)m_ParticleBuffers.m_AtlasId.m_Ptr; + field.m_Storage.m_Stride = sizeof(float); + } else if (addInput.m_Name == BasicRendererProperties::SID_Emissive_EmissiveColor() && addInput.m_Type == BaseType_Float3) { if (!PK_VERIFY(m_ParticleBuffers.m_AdditionalFieldsBuffers.PushBack().Valid())) @@ -2054,6 +2066,10 @@ void CUnityBillboardingBatchPolicy::CBillboard_Exec_SOA_OAS::_CopyData(u32 verte (m_ShaderVariationFlags & ShaderVariationFlags::Has_AnimBlend) == 0) { FillTransformUVsRotate(&(m_ParticleBuffers.m_TransformUVsRotate[vertexID]), bfPtr, *m_SemanticOffsets); + if ((m_ShaderVariationFlags & ShaderVariationFlags::Has_Atlas) != 0) + { + FillAtlasId(&(m_ParticleBuffers.m_AtlasId[vertexID]), bfPtr, *m_SemanticOffsets); + } } FillTransformUVsScaleAndOffset(&(((CFloat2*)m_ParticleBuffers.m_TransformUVsScale)[vertexID]), &(((CFloat2*)m_ParticleBuffers.m_TransformUVsOffset)[vertexID]), bfPtr, *m_SemanticOffsets); } diff --git a/README.md b/README.md index 1b44c30e..7403a279 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.19.5` +* **Version:** `v2.19.6` * **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 14971771..e6e0dcd9 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.19.5` +* **Version:** `v2.19.6` * **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 1b44c30e..7403a279 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.19.5` +* **Version:** `v2.19.6` * **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 27b8a3a3..b91e99ce 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.19.5", + "version": "2.19.6", "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.5" + "com.persistant-studios.popcornfx": "2.19.6" } } diff --git a/com.persistant-studios.popcornfx.urp/Documentation~/popcornfx.urp.md b/com.persistant-studios.popcornfx.urp/Documentation~/popcornfx.urp.md index 6c26863a..bc3a0e10 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.19.5` +* **Version:** `v2.19.6` * **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 1b44c30e..7403a279 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.19.5` +* **Version:** `v2.19.6` * **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/Runtime/Materials/URP_Mesh_LitOpaque.shadergraph b/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Mesh_LitOpaque.shadergraph index fe57cccd..25db190c 100644 --- a/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Mesh_LitOpaque.shadergraph +++ b/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Mesh_LitOpaque.shadergraph @@ -172,18 +172,12 @@ { "m_Id": "b2731da8fe4e45ebb9b099b3a8e3a529" }, - { - "m_Id": "1d0373ba5c3e4c428f5090802d12e7f5" - }, { "m_Id": "e53d98bc05964905b0b6fa9ea7de02e3" }, { "m_Id": "ab9ca6d8059948dd84c46e410afd9078" }, - { - "m_Id": "549fdbf940b24f5ebe5b720bb0733c26" - }, { "m_Id": "497eb7fc079e4cae90756282cf5e7d2f" }, @@ -193,9 +187,6 @@ { "m_Id": "db2998e9b78442d0b6f03def525ab896" }, - { - "m_Id": "9140d31cbb234bac8b65e2ead5c983cf" - }, { "m_Id": "76758991536c445b90457fcd0933e8dd" }, @@ -241,9 +232,6 @@ { "m_Id": "d3534bf27a854570bd879f420e220f62" }, - { - "m_Id": "93147f22c4bd44638694b3ae208e1faf" - }, { "m_Id": "ed6cac58c7144ac6946d78ec1df57bdf" }, @@ -405,6 +393,24 @@ }, { "m_Id": "5c6e2936c2804a18a2e27aed04beda5d" + }, + { + "m_Id": "06614591c0034dc4a4f653a1269bc5db" + }, + { + "m_Id": "2904c754609e4978b91bb4937b31fae7" + }, + { + "m_Id": "7f2a4681d49742919d58c4abf46b923b" + }, + { + "m_Id": "774b2da240a74979aa09be119d8d9902" + }, + { + "m_Id": "825badfb5bef4014ad8ab75d3c928518" + }, + { + "m_Id": "fbf3c117af324f8cb01f6e1f123aea7b" } ], "m_GroupDatas": [ @@ -417,6 +423,20 @@ ], "m_StickyNoteDatas": [], "m_Edges": [ + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "06614591c0034dc4a4f653a1269bc5db" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "34c612b9b96540df8eb923cc345d98e6" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -532,13 +552,13 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "1d0373ba5c3e4c428f5090802d12e7f5" + "m_Id": "22fb64a5c35b4d4b879b0b1edf16be8e" }, "m_SlotId": 2 }, "m_InputSlot": { "m_Node": { - "m_Id": "549fdbf940b24f5ebe5b720bb0733c26" + "m_Id": "2522bf4ff5644187aa4238b286e98ad8" }, "m_SlotId": 0 } @@ -546,71 +566,85 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "1d0373ba5c3e4c428f5090802d12e7f5" + "m_Id": "22fb64a5c35b4d4b879b0b1edf16be8e" }, "m_SlotId": 2 }, "m_InputSlot": { "m_Node": { - "m_Id": "76758991536c445b90457fcd0933e8dd" + "m_Id": "508907660aa1474691604b990c2d9020" }, - "m_SlotId": 2 + "m_SlotId": 1 } }, { "m_OutputSlot": { "m_Node": { - "m_Id": "22fb64a5c35b4d4b879b0b1edf16be8e" + "m_Id": "2522bf4ff5644187aa4238b286e98ad8" }, - "m_SlotId": 2 + "m_SlotId": 1 }, "m_InputSlot": { "m_Node": { - "m_Id": "2522bf4ff5644187aa4238b286e98ad8" + "m_Id": "ab9ca6d8059948dd84c46e410afd9078" }, - "m_SlotId": 0 + "m_SlotId": 1 } }, { "m_OutputSlot": { "m_Node": { - "m_Id": "22fb64a5c35b4d4b879b0b1edf16be8e" + "m_Id": "25b09702f72343f2975fc02b7f483d3c" + }, + "m_SlotId": 4 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "76758991536c445b90457fcd0933e8dd" }, "m_SlotId": 2 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "25b09702f72343f2975fc02b7f483d3c" + }, + "m_SlotId": 4 }, "m_InputSlot": { "m_Node": { - "m_Id": "508907660aa1474691604b990c2d9020" + "m_Id": "774b2da240a74979aa09be119d8d9902" }, - "m_SlotId": 1 + "m_SlotId": 0 } }, { "m_OutputSlot": { "m_Node": { - "m_Id": "2522bf4ff5644187aa4238b286e98ad8" + "m_Id": "2904c754609e4978b91bb4937b31fae7" }, - "m_SlotId": 1 + "m_SlotId": 0 }, "m_InputSlot": { "m_Node": { - "m_Id": "ab9ca6d8059948dd84c46e410afd9078" + "m_Id": "06614591c0034dc4a4f653a1269bc5db" }, - "m_SlotId": 1 + "m_SlotId": 0 } }, { "m_OutputSlot": { "m_Node": { - "m_Id": "25b09702f72343f2975fc02b7f483d3c" + "m_Id": "2904c754609e4978b91bb4937b31fae7" }, - "m_SlotId": 4 + "m_SlotId": 0 }, "m_InputSlot": { "m_Node": { - "m_Id": "1d0373ba5c3e4c428f5090802d12e7f5" + "m_Id": "7f2a4681d49742919d58c4abf46b923b" }, - "m_SlotId": 1 + "m_SlotId": 0 } }, { @@ -907,48 +941,6 @@ "m_SlotId": 1 } }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "549fdbf940b24f5ebe5b720bb0733c26" - }, - "m_SlotId": 1 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "fc3e698d5092452d8c02d4d16f30870b" - }, - "m_SlotId": 1 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "549fdbf940b24f5ebe5b720bb0733c26" - }, - "m_SlotId": 4 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "9140d31cbb234bac8b65e2ead5c983cf" - }, - "m_SlotId": 0 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "549fdbf940b24f5ebe5b720bb0733c26" - }, - "m_SlotId": 4 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "db2998e9b78442d0b6f03def525ab896" - }, - "m_SlotId": 2 - } - }, { "m_OutputSlot": { "m_Node": { @@ -1182,7 +1174,7 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "34c612b9b96540df8eb923cc345d98e6" + "m_Id": "06614591c0034dc4a4f653a1269bc5db" }, "m_SlotId": 1 } @@ -1201,6 +1193,48 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "774b2da240a74979aa09be119d8d9902" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "fc3e698d5092452d8c02d4d16f30870b" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "774b2da240a74979aa09be119d8d9902" + }, + "m_SlotId": 4 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "c6bc274413bb4e63bf4488204ae5d6d8" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "774b2da240a74979aa09be119d8d9902" + }, + "m_SlotId": 4 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "fbf3c117af324f8cb01f6e1f123aea7b" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -1246,13 +1280,13 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "7faadb2b47fd4e81aadfb6ef29caa2d7" + "m_Id": "7f2a4681d49742919d58c4abf46b923b" }, - "m_SlotId": 2 + "m_SlotId": 4 }, "m_InputSlot": { "m_Node": { - "m_Id": "9a99a1f8b9b44f9bade11eef3ae71042" + "m_Id": "825badfb5bef4014ad8ab75d3c928518" }, "m_SlotId": 0 } @@ -1260,41 +1294,41 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "857b42120a7c43e6bbc815f11cf516ec" + "m_Id": "7faadb2b47fd4e81aadfb6ef29caa2d7" }, - "m_SlotId": 0 + "m_SlotId": 2 }, "m_InputSlot": { "m_Node": { - "m_Id": "a361a8d12f4c41409043f34ed4b9763a" + "m_Id": "9a99a1f8b9b44f9bade11eef3ae71042" }, - "m_SlotId": 1 + "m_SlotId": 0 } }, { "m_OutputSlot": { "m_Node": { - "m_Id": "8e7139c02d9e47f09e0de1aba6b92321" + "m_Id": "825badfb5bef4014ad8ab75d3c928518" }, "m_SlotId": 2 }, "m_InputSlot": { "m_Node": { - "m_Id": "560f8fd606654bf6a536ba64f9b1acdb" + "m_Id": "db2998e9b78442d0b6f03def525ab896" }, - "m_SlotId": 0 + "m_SlotId": 2 } }, { "m_OutputSlot": { "m_Node": { - "m_Id": "9140d31cbb234bac8b65e2ead5c983cf" + "m_Id": "857b42120a7c43e6bbc815f11cf516ec" }, - "m_SlotId": 1 + "m_SlotId": 0 }, "m_InputSlot": { "m_Node": { - "m_Id": "c6bc274413bb4e63bf4488204ae5d6d8" + "m_Id": "a361a8d12f4c41409043f34ed4b9763a" }, "m_SlotId": 1 } @@ -1302,13 +1336,13 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "93147f22c4bd44638694b3ae208e1faf" + "m_Id": "8e7139c02d9e47f09e0de1aba6b92321" }, - "m_SlotId": 0 + "m_SlotId": 2 }, "m_InputSlot": { "m_Node": { - "m_Id": "1d0373ba5c3e4c428f5090802d12e7f5" + "m_Id": "560f8fd606654bf6a536ba64f9b1acdb" }, "m_SlotId": 0 } @@ -1929,6 +1963,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "fbf3c117af324f8cb01f6e1f123aea7b" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "825badfb5bef4014ad8ab75d3c928518" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -2188,6 +2236,44 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "06614591c0034dc4a4f653a1269bc5db", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1002.0000610351563, + "y": 1060.0, + "width": 130.0, + "height": 118.0 + } + }, + "m_Slots": [ + { + "m_Id": "65126414cc7b4ab3a1e9a2f01639f46f" + }, + { + "m_Id": "27c5a61af0494906ac98e353654b7da3" + }, + { + "m_Id": "38e8a79979ec41a78cb7a5b6412ee1a4" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", @@ -2483,39 +2569,87 @@ "m_Labels": [] } -{ - "m_SGVersion": 1, - "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", - "m_ObjectId": "0f5e550caee9419aae750887dd2173b4", - "m_Guid": { - "m_GuidSerialized": "d79453d2-2a45-4d71-8654-ec89b9140409" - }, - "m_Name": "_VATCursor", - "m_DefaultRefNameVersion": 1, - "m_RefNameGeneratedByDisplayName": "_VATCursor", - "m_DefaultReferenceName": "_VATCursor", - "m_OverrideReferenceName": "", - "m_GeneratePropertyBlock": true, - "m_UseCustomSlotLabel": false, - "m_CustomSlotLabel": "", - "m_Precision": 0, - "overrideHLSLDeclaration": true, - "hlslDeclarationOverride": 3, - "m_Hidden": false, - "m_Value": 0.0, - "m_FloatType": 0, - "m_RangeValues": { - "x": 0.0, - "y": 1.0 - } -} - { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", - "m_ObjectId": "0fe049170b084142b88cc4fa2113ec07", - "m_Id": 12, - "m_DisplayName": "oldUV0", + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "0efa323457e74e3789fab0b5d3b00e05", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "0f5e550caee9419aae750887dd2173b4", + "m_Guid": { + "m_GuidSerialized": "d79453d2-2a45-4d71-8654-ec89b9140409" + }, + "m_Name": "_VATCursor", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "_VATCursor", + "m_DefaultReferenceName": "_VATCursor", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_Precision": 0, + "overrideHLSLDeclaration": true, + "hlslDeclarationOverride": 3, + "m_Hidden": false, + "m_Value": 0.0, + "m_FloatType": 0, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "0fe049170b084142b88cc4fa2113ec07", + "m_Id": 12, + "m_DisplayName": "oldUV0", "m_SlotType": 1, "m_Hidden": false, "m_ShaderOutputName": "oldUV0", @@ -2751,54 +2885,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "141aa8c0d77c4c7aa1fd11ca01818a0b", - "m_Id": 1, - "m_DisplayName": "B", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "B", - "m_StageCapability": 3, - "m_Value": { - "e00": 2.0, - "e01": 2.0, - "e02": 2.0, - "e03": 2.0, - "e10": 2.0, - "e11": 2.0, - "e12": 2.0, - "e13": 2.0, - "e20": 2.0, - "e21": 2.0, - "e22": 2.0, - "e23": 2.0, - "e30": 2.0, - "e31": 2.0, - "e32": 2.0, - "e33": 2.0 - }, - "m_DefaultValue": { - "e00": 1.0, - "e01": 0.0, - "e02": 0.0, - "e03": 0.0, - "e10": 0.0, - "e11": 1.0, - "e12": 0.0, - "e13": 0.0, - "e20": 0.0, - "e21": 0.0, - "e22": 1.0, - "e23": 0.0, - "e30": 0.0, - "e31": 0.0, - "e32": 0.0, - "e33": 1.0 - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", @@ -2868,6 +2954,21 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "154e902ee91a46198600a0bb3f2a26a6", + "m_Id": 1, + "m_DisplayName": "R", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "R", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -3328,44 +3429,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", - "m_ObjectId": "1d0373ba5c3e4c428f5090802d12e7f5", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Multiply", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -2272.0, - "y": 1359.0, - "width": 129.999755859375, - "height": 118.0 - } - }, - "m_Slots": [ - { - "m_Id": "cc60cb4a5dd647c3a22d99a315672496" - }, - { - "m_Id": "141aa8c0d77c4c7aa1fd11ca01818a0b" - }, - { - "m_Id": "469f1635ab8f46b290cef14704b8d466" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": false, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -3564,6 +3627,30 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "2578d835cac849328dabd7e0a91b906d", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.CustomFunctionNode", @@ -3682,6 +3769,54 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "27c5a61af0494906ac98e353654b7da3", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 2.0, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -3706,6 +3841,40 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CustomInterpolatorNode", + "m_ObjectId": "2904c754609e4978b91bb4937b31fae7", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Color (Custom Interpolator)", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1233.0001220703125, + "y": 1017.0000610351563, + "width": 202.0001220703125, + "height": 93.99993896484375 + } + }, + "m_Slots": [ + { + "m_Id": "807c392c6eae4535918fbf5bbdd5601e" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "customBlockNodeName": "Color", + "serializedType": 4 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -4051,6 +4220,30 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "321039c67aff4a4d9271ce32a35aef8f", + "m_Id": 1, + "m_DisplayName": "", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.ShaderKeyword", @@ -4117,21 +4310,6 @@ "m_DefaultType": 0 } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "34537a142a9e496ebb2007367f542913", - "m_Id": 4, - "m_DisplayName": "A", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "A", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.AddNode", @@ -4266,6 +4444,54 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "38e8a79979ec41a78cb7a5b6412ee1a4", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.FloorNode", @@ -4646,6 +4872,21 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "4205ddbf9c934a0e8c3ffbea24ed27fa", + "m_Id": 2, + "m_DisplayName": "G", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "G", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", @@ -4930,54 +5171,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "469f1635ab8f46b290cef14704b8d466", - "m_Id": 2, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": { - "e00": 0.0, - "e01": 0.0, - "e02": 0.0, - "e03": 0.0, - "e10": 0.0, - "e11": 0.0, - "e12": 0.0, - "e13": 0.0, - "e20": 0.0, - "e21": 0.0, - "e22": 0.0, - "e23": 0.0, - "e30": 0.0, - "e31": 0.0, - "e32": 0.0, - "e33": 0.0 - }, - "m_DefaultValue": { - "e00": 1.0, - "e01": 0.0, - "e02": 0.0, - "e03": 0.0, - "e10": 0.0, - "e11": 1.0, - "e12": 0.0, - "e13": 0.0, - "e20": 0.0, - "e21": 0.0, - "e22": 1.0, - "e23": 0.0, - "e30": 0.0, - "e31": 0.0, - "e32": 0.0, - "e33": 1.0 - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -5002,30 +5195,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "48068e7a66d0471a91ea530b59e8639d", - "m_Id": 0, - "m_DisplayName": "In", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "In", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot", @@ -5040,6 +5209,21 @@ "m_DefaultValue": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "48cfea865cae4d30b94c048254f5067a", + "m_Id": 4, + "m_DisplayName": "A", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", @@ -5178,6 +5362,21 @@ "m_EnableGlobalMipBias": true } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "49d8f00aaa7844549852e8f5fcdc5848", + "m_Id": 2, + "m_DisplayName": "G", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "G", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", @@ -5537,31 +5736,6 @@ "m_BareResource": false } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", - "m_ObjectId": "53ebb616c895409288e671ee341d9da8", - "m_Id": 0, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 2, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", @@ -5587,52 +5761,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.SplitNode", - "m_ObjectId": "549fdbf940b24f5ebe5b720bb0733c26", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Split", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -2032.9998779296875, - "y": 1504.0, - "width": 119.9998779296875, - "height": 149.0 - } - }, - "m_Slots": [ - { - "m_Id": "48068e7a66d0471a91ea530b59e8639d" - }, - { - "m_Id": "f184ea8f0b3c421c822ea89cbfbd87b4" - }, - { - "m_Id": "c7f64dd82b78402b88fdacf0d16b93a2" - }, - { - "m_Id": "8ac57d1b19aa44ae88c6cb9c3742c9d2" - }, - { - "m_Id": "34537a142a9e496ebb2007367f542913" - } - ], - "synonyms": [ - "separate" - ], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DivideNode", @@ -6130,30 +6258,6 @@ ] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "639422683013421ba9966253efbab538", - "m_Id": 0, - "m_DisplayName": "", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", @@ -6190,6 +6294,54 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "65126414cc7b4ab3a1e9a2f01639f46f", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -6807,10 +6959,34 @@ "m_DefaultValue": { "x": 0.0, "y": 0.0, - "z": 0.0 - }, - "m_Labels": [], - "m_Space": 3 + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 3 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "73f58db4e7834713b059897c496643cf", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } } { @@ -6835,6 +7011,30 @@ "m_Value": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "755234dfe99d466093f8c11511e322ce", + "m_Id": 0, + "m_DisplayName": "", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -6850,6 +7050,21 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "759556b2493441b39997d5915d5bf077", + "m_Id": 3, + "m_DisplayName": "B", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot", @@ -6975,6 +7190,52 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SplitNode", + "m_ObjectId": "774b2da240a74979aa09be119d8d9902", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Split", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -2165.0, + "y": 1504.0, + "width": 120.0, + "height": 149.0 + } + }, + "m_Slots": [ + { + "m_Id": "73f58db4e7834713b059897c496643cf" + }, + { + "m_Id": "8827a11d14234561a03c05346b336408" + }, + { + "m_Id": "49d8f00aaa7844549852e8f5fcdc5848" + }, + { + "m_Id": "759556b2493441b39997d5915d5bf077" + }, + { + "m_Id": "ce198292c67e479c96816d33618e6086" + } + ], + "synonyms": [ + "separate" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", @@ -7277,6 +7538,52 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SplitNode", + "m_ObjectId": "7f2a4681d49742919d58c4abf46b923b", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Split", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1002.0000610351563, + "y": 911.0, + "width": 120.00006103515625, + "height": 149.0 + } + }, + "m_Slots": [ + { + "m_Id": "2578d835cac849328dabd7e0a91b906d" + }, + { + "m_Id": "154e902ee91a46198600a0bb3f2a26a6" + }, + { + "m_Id": "4205ddbf9c934a0e8c3ffbea24ed27fa" + }, + { + "m_Id": "95e61df7be0b475a80c00b288727f626" + }, + { + "m_Id": "48cfea865cae4d30b94c048254f5067a" + } + ], + "synonyms": [ + "separate" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot", @@ -7406,6 +7713,31 @@ "m_SerializedDescriptor": "SurfaceDescription.Specular" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "807c392c6eae4535918fbf5bbdd5601e", + "m_Id": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", @@ -7468,6 +7800,48 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "825badfb5bef4014ad8ab75d3c928518", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -853.0000610351563, + "y": 1298.0, + "width": 126.00006103515625, + "height": 118.0 + } + }, + "m_Slots": [ + { + "m_Id": "0efa323457e74e3789fab0b5d3b00e05" + }, + { + "m_Id": "d34aee7c17164dae8b1b7183876a6b30" + }, + { + "m_Id": "c928472e42c0416e84302e56296c2319" + } + ], + "synonyms": [ + "multiplication", + "times", + "x" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -7751,12 +8125,12 @@ { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "8a0de7d14e5d49e4aba7250e63c22d0a", - "m_Id": 2, - "m_DisplayName": "Height", + "m_ObjectId": "8827a11d14234561a03c05346b336408", + "m_Id": 1, + "m_DisplayName": "R", "m_SlotType": 1, "m_Hidden": false, - "m_ShaderOutputName": "Height", + "m_ShaderOutputName": "R", "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, @@ -7766,12 +8140,12 @@ { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "8ac57d1b19aa44ae88c6cb9c3742c9d2", - "m_Id": 3, - "m_DisplayName": "B", + "m_ObjectId": "8a0de7d14e5d49e4aba7250e63c22d0a", + "m_Id": 2, + "m_DisplayName": "Height", "m_SlotType": 1, "m_Hidden": false, - "m_ShaderOutputName": "B", + "m_ShaderOutputName": "Height", "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, @@ -7935,41 +8309,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.RedirectNodeData", - "m_ObjectId": "9140d31cbb234bac8b65e2ead5c983cf", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Redirect Node", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -1841.0, - "y": 1520.0, - "width": 55.9998779296875, - "height": 24.0001220703125 - } - }, - "m_Slots": [ - { - "m_Id": "639422683013421ba9966253efbab538" - }, - { - "m_Id": "f4bfa35e641247d7a506de2391f1d0bd" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -7996,42 +8335,8 @@ "m_SlotType": 1, "m_Hidden": false, "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_BareResource": false -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.CustomInterpolatorNode", - "m_ObjectId": "93147f22c4bd44638694b3ae208e1faf", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Color (Custom Interpolator)", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -2503.000244140625, - "y": 1315.9998779296875, - "width": 202.000244140625, - "height": 94.0 - } - }, - "m_Slots": [ - { - "m_Id": "53ebb616c895409288e671ee341d9da8" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": false, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "customBlockNodeName": "Color", - "serializedType": 4 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -8178,6 +8483,21 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "95e61df7be0b475a80c00b288727f626", + "m_Id": 3, + "m_DisplayName": "B", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -9868,21 +10188,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "c7f64dd82b78402b88fdacf0d16b93a2", - "m_Id": 2, - "m_DisplayName": "G", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "G", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -9922,6 +10227,54 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "c928472e42c0416e84302e56296c2319", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", @@ -10038,54 +10391,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "cc60cb4a5dd647c3a22d99a315672496", - "m_Id": 0, - "m_DisplayName": "A", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "A", - "m_StageCapability": 3, - "m_Value": { - "e00": 0.0, - "e01": 0.0, - "e02": 0.0, - "e03": 0.0, - "e10": 0.0, - "e11": 0.0, - "e12": 0.0, - "e13": 0.0, - "e20": 0.0, - "e21": 0.0, - "e22": 0.0, - "e23": 0.0, - "e30": 0.0, - "e31": 0.0, - "e32": 0.0, - "e33": 0.0 - }, - "m_DefaultValue": { - "e00": 1.0, - "e01": 0.0, - "e02": 0.0, - "e03": 0.0, - "e10": 0.0, - "e11": 1.0, - "e12": 0.0, - "e13": 0.0, - "e20": 0.0, - "e21": 0.0, - "e22": 1.0, - "e23": 0.0, - "e30": 0.0, - "e31": 0.0, - "e32": 0.0, - "e33": 1.0 - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -10128,6 +10433,21 @@ "m_DefaultType": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "ce198292c67e479c96816d33618e6086", + "m_Id": 4, + "m_DisplayName": "A", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", @@ -10242,6 +10562,54 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "d34aee7c17164dae8b1b7183876a6b30", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 2.0, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -10461,10 +10829,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -867.0, - "y": 1553.0, - "width": 223.00006103515626, - "height": 118.0001220703125 + "x": -668.0000610351563, + "y": 1526.0, + "width": 223.00009155273438, + "height": 118.0 } }, "m_Slots": [ @@ -10850,7 +11218,7 @@ ], "synonyms": [], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -11542,21 +11910,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "f184ea8f0b3c421c822ea89cbfbd87b4", - "m_Id": 1, - "m_DisplayName": "R", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "R", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", @@ -11705,30 +12058,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "f4bfa35e641247d7a506de2391f1d0bd", - "m_Id": 1, - "m_DisplayName": "", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", @@ -12040,6 +12369,41 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.RedirectNodeData", + "m_ObjectId": "fbf3c117af324f8cb01f6e1f123aea7b", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Redirect Node", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1100.9998779296875, + "y": 1608.0, + "width": 55.9998779296875, + "height": 24.0 + } + }, + "m_Slots": [ + { + "m_Id": "755234dfe99d466093f8c11511e322ce" + }, + { + "m_Id": "321039c67aff4a4d9271ce32a35aef8f" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector2Node", diff --git a/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Mesh_LitTransparent.shadergraph b/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Mesh_LitTransparent.shadergraph index 4818fef3..024cd33c 100644 --- a/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Mesh_LitTransparent.shadergraph +++ b/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Mesh_LitTransparent.shadergraph @@ -157,9 +157,6 @@ { "m_Id": "72dc39391b0746b6a5c8e7a38d2499d8" }, - { - "m_Id": "a68d7d24b5dd4a5c8042f51adeb81623" - }, { "m_Id": "db0929cbb3c542c6b1934a5343d0b360" }, @@ -262,9 +259,6 @@ { "m_Id": "c1473352da65438191ac776c4d22e855" }, - { - "m_Id": "6b80dbc9819f40c5a87d1cf55e29f8ad" - }, { "m_Id": "07a638e7179c4fd3a0696f7452ecb416" }, @@ -438,6 +432,18 @@ }, { "m_Id": "2a305d117b0c4a6b96c0db6eb540ea95" + }, + { + "m_Id": "b8a90e4c55b447909026a2eac069266e" + }, + { + "m_Id": "f4007ace6d05434eb23944ad2e19cb6b" + }, + { + "m_Id": "5f807f4b33b24f53b240ccb26d7f9e38" + }, + { + "m_Id": "fb792138ed944d319e0f026d2ff55e76" } ], "m_GroupDatas": [ @@ -446,6 +452,15 @@ }, { "m_Id": "9aa0e3d8a85443fc888e250cec5e066b" + }, + { + "m_Id": "2a526f5273934d0ba941a0d66d32328a" + }, + { + "m_Id": "40e595c48b344276b7ffb990706f83c1" + }, + { + "m_Id": "b9cb8a64160e49bb9f5e8430f13b8fd5" } ], "m_StickyNoteDatas": [], @@ -571,9 +586,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "49f190aada1b40e388139767aa5a750e" + "m_Id": "b2824462469d452fa4799e066d12a242" }, - "m_SlotId": 2 + "m_SlotId": 0 } }, { @@ -585,7 +600,7 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "b2824462469d452fa4799e066d12a242" + "m_Id": "fb792138ed944d319e0f026d2ff55e76" }, "m_SlotId": 0 } @@ -823,9 +838,23 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "a68d7d24b5dd4a5c8042f51adeb81623" + "m_Id": "1e2ac38cfdaf42f8a7dfdf7a4756d053" }, - "m_SlotId": 1 + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "4919be38f2304a4487d4cc4a716186fe" + }, + "m_SlotId": 4 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "4ee7172b36f249f3abe7a812173a9b56" + }, + "m_SlotId": 2 } }, { @@ -865,7 +894,7 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "387a962203d5447ca6c25587e3ee51da" + "m_Id": "b8a90e4c55b447909026a2eac069266e" }, "m_SlotId": 1 } @@ -954,6 +983,20 @@ "m_SlotId": 2 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "5f807f4b33b24f53b240ccb26d7f9e38" + }, + "m_SlotId": 4 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "fb792138ed944d319e0f026d2ff55e76" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -1038,20 +1081,6 @@ "m_SlotId": 1 } }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "6b80dbc9819f40c5a87d1cf55e29f8ad" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "a68d7d24b5dd4a5c8042f51adeb81623" - }, - "m_SlotId": 0 - } - }, { "m_OutputSlot": { "m_Node": { @@ -1654,34 +1683,6 @@ "m_SlotId": 2 } }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "a68d7d24b5dd4a5c8042f51adeb81623" - }, - "m_SlotId": 2 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "1e2ac38cfdaf42f8a7dfdf7a4756d053" - }, - "m_SlotId": 0 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "a68d7d24b5dd4a5c8042f51adeb81623" - }, - "m_SlotId": 2 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "4ee7172b36f249f3abe7a812173a9b56" - }, - "m_SlotId": 2 - } - }, { "m_OutputSlot": { "m_Node": { @@ -1752,6 +1753,20 @@ "m_SlotId": 1 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "b8a90e4c55b447909026a2eac069266e" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "387a962203d5447ca6c25587e3ee51da" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -2102,6 +2117,34 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "f4007ace6d05434eb23944ad2e19cb6b" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "5f807f4b33b24f53b240ccb26d7f9e38" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "f4007ace6d05434eb23944ad2e19cb6b" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "b8a90e4c55b447909026a2eac069266e" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -2130,6 +2173,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "fb792138ed944d319e0f026d2ff55e76" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "49f190aada1b40e388139767aa5a750e" + }, + "m_SlotId": 2 + } + }, { "m_OutputSlot": { "m_Node": { @@ -2424,54 +2481,6 @@ "m_DefaultValue": false } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "0716815c8a7046dcab37df9acfb86dab", - "m_Id": 2, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": { - "e00": 0.0, - "e01": 0.0, - "e02": 0.0, - "e03": 0.0, - "e10": 0.0, - "e11": 0.0, - "e12": 0.0, - "e13": 0.0, - "e20": 0.0, - "e21": 0.0, - "e22": 0.0, - "e23": 0.0, - "e30": 0.0, - "e31": 0.0, - "e32": 0.0, - "e33": 0.0 - }, - "m_DefaultValue": { - "e00": 1.0, - "e01": 0.0, - "e02": 0.0, - "e03": 0.0, - "e10": 0.0, - "e11": 1.0, - "e12": 0.0, - "e13": 0.0, - "e20": 0.0, - "e21": 0.0, - "e22": 1.0, - "e23": 0.0, - "e30": 0.0, - "e31": 0.0, - "e32": 0.0, - "e33": 1.0 - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", @@ -2760,8 +2769,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -6520.99951171875, - "y": -419.0000305175781, + "x": -4856.99951171875, + "y": -517.0, "width": 126.0, "height": 118.0 } @@ -2916,10 +2925,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -6509.0, - "y": 177.9999237060547, + "x": -4844.99951171875, + "y": 79.9998550415039, "width": 126.0, - "height": 118.00010681152344 + "height": 118.0000228881836 } }, "m_Slots": [ @@ -2970,17 +2979,17 @@ "m_Type": "UnityEditor.ShaderGraph.PropertyNode", "m_ObjectId": "151888f438d7432496dfaa13a3365a45", "m_Group": { - "m_Id": "" + "m_Id": "40e595c48b344276b7ffb990706f83c1" }, "m_Name": "Property", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -3603.999755859375, - "y": -486.9999694824219, - "width": 156.999755859375, - "height": 34.0 + "x": -2463.999755859375, + "y": -465.9999694824219, + "width": 157.0, + "height": 34.000091552734378 } }, "m_Slots": [ @@ -3211,17 +3220,17 @@ "m_Type": "UnityEditor.ShaderGraph.PropertyNode", "m_ObjectId": "197af6b0414f4a4b8f56c26b565a354f", "m_Group": { - "m_Id": "" + "m_Id": "b9cb8a64160e49bb9f5e8430f13b8fd5" }, "m_Name": "Property", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -3509.999755859375, - "y": 573.0, - "width": 208.999755859375, - "height": 34.00006103515625 + "x": -2635.0, + "y": 510.9999694824219, + "width": 209.0, + "height": 33.999969482421878 } }, "m_Slots": [ @@ -3241,54 +3250,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "19f89984df7842e1a7fb2f400317ff0b", - "m_Id": 1, - "m_DisplayName": "B", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "B", - "m_StageCapability": 3, - "m_Value": { - "e00": 2.0, - "e01": 2.0, - "e02": 2.0, - "e03": 2.0, - "e10": 2.0, - "e11": 2.0, - "e12": 2.0, - "e13": 2.0, - "e20": 2.0, - "e21": 2.0, - "e22": 2.0, - "e23": 2.0, - "e30": 2.0, - "e31": 2.0, - "e32": 2.0, - "e33": 2.0 - }, - "m_DefaultValue": { - "e00": 1.0, - "e01": 0.0, - "e02": 0.0, - "e03": 0.0, - "e10": 0.0, - "e11": 1.0, - "e12": 0.0, - "e13": 0.0, - "e20": 0.0, - "e21": 0.0, - "e22": 1.0, - "e23": 0.0, - "e30": 0.0, - "e31": 0.0, - "e32": 0.0, - "e33": 1.0 - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -3301,10 +3262,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -5011.8251953125, - "y": 285.4378356933594, - "width": 116.0, - "height": 33.99993896484375 + "x": -3347.99951171875, + "y": 186.99984741210938, + "width": 115.999755859375, + "height": 33.99998474121094 } }, "m_Slots": [ @@ -3414,17 +3375,17 @@ "m_Type": "UnityEditor.ShaderGraph.Vector2Node", "m_ObjectId": "1d5ed47253a64f9098e803b10edfbd5b", "m_Group": { - "m_Id": "" + "m_Id": "40e595c48b344276b7ffb990706f83c1" }, "m_Name": "Vector 2", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1407.9998779296875, - "y": -340.9999694824219, - "width": 127.9998779296875, - "height": 101.00003051757813 + "x": -1310.0001220703125, + "y": -376.99993896484377, + "width": 128.0, + "height": 100.99993896484375 } }, "m_Slots": [ @@ -3468,10 +3429,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -5529.99951171875, - "y": 350.9999694824219, - "width": 129.99951171875, - "height": 118.00009155273438 + "x": -3865.99951171875, + "y": 252.99996948242188, + "width": 130.0, + "height": 118.00003051757813 } }, "m_Slots": [ @@ -3499,15 +3460,15 @@ "m_Type": "UnityEditor.ShaderGraph.SplitNode", "m_ObjectId": "1e2ac38cfdaf42f8a7dfdf7a4756d053", "m_Group": { - "m_Id": "" + "m_Id": "b9cb8a64160e49bb9f5e8430f13b8fd5" }, "m_Name": "Split", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2005.0, - "y": 449.0, + "x": -1992.0, + "y": 445.0, "width": 120.0, "height": 149.0 } @@ -4108,6 +4069,17 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.GroupData", + "m_ObjectId": "2a526f5273934d0ba941a0d66d32328a", + "m_Title": "Soft Particle", + "m_Position": { + "x": 10.0, + "y": 10.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -4149,8 +4121,8 @@ "m_ObjectId": "2cd1024f38544fd580d7a13b2f6d806b", "m_Title": "Mesh Texture Atlas UV1", "m_Position": { - "x": -6886.80810546875, - "y": 79.3887710571289 + "x": -5222.99951171875, + "y": -19.000091552734376 } } @@ -4213,8 +4185,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -6188.0, - "y": -306.0, + "x": -4523.99951171875, + "y": -404.00006103515627, "width": 128.0, "height": 101.00003051757813 } @@ -4335,15 +4307,15 @@ "m_Type": "UnityEditor.ShaderGraph.Vector1Node", "m_ObjectId": "30a50d847d744a89a3e0a086702c2a47", "m_Group": { - "m_Id": "" + "m_Id": "2a526f5273934d0ba941a0d66d32328a" }, "m_Name": "Float", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1446.0001220703125, - "y": 1209.0001220703125, + "x": -906.0001220703125, + "y": 1166.0, "width": 126.0, "height": 77.0 } @@ -4364,7 +4336,7 @@ "scalar" ], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4464,17 +4436,17 @@ "m_Type": "UnityEditor.ShaderGraph.ClampNode", "m_ObjectId": "3410bf30a19f4f6c993de839422be980", "m_Group": { - "m_Id": "" + "m_Id": "2a526f5273934d0ba941a0d66d32328a" }, "m_Name": "Clamp", "m_DrawState": { - "m_Expanded": true, + "m_Expanded": false, "m_Position": { "serializedVersion": "2", - "x": -912.0001220703125, - "y": 1120.0, - "width": 208.00006103515626, - "height": 326.0 + "x": -611.9999389648438, + "y": 1094.0, + "width": 139.99996948242188, + "height": 142.0001220703125 } }, "m_Slots": [ @@ -4495,7 +4467,7 @@ "limit" ], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4697,13 +4669,28 @@ "plus" ], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "390eba07570f4f3787778dc964ae1a01", + "m_Id": 2, + "m_DisplayName": "G", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "G", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -4815,10 +4802,10 @@ "m_Expanded": false, "m_Position": { "serializedVersion": "2", - "x": -6193.0, - "y": 408.0, + "x": -4528.99951171875, + "y": 309.9999084472656, "width": 145.0, - "height": 137.0 + "height": 137.00009155273438 } }, "m_Slots": [ @@ -4973,17 +4960,17 @@ "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", "m_ObjectId": "3f24e4794b06484d96f451e2b2141aaf", "m_Group": { - "m_Id": "" + "m_Id": "2a526f5273934d0ba941a0d66d32328a" }, "m_Name": "Multiply", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1195.0001220703125, - "y": 1131.0001220703125, - "width": 208.0, - "height": 302.0 + "x": -746.0001831054688, + "y": 1094.0, + "width": 126.00006103515625, + "height": 118.0 } }, "m_Slots": [ @@ -5003,7 +4990,7 @@ "x" ], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5022,10 +5009,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -6807.0, - "y": -247.0000457763672, + "x": -5142.99951171875, + "y": -345.0000305175781, "width": 144.0, - "height": 34.000030517578128 + "height": 33.999969482421878 } }, "m_Slots": [ @@ -5060,6 +5047,17 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.GroupData", + "m_ObjectId": "40e595c48b344276b7ffb990706f83c1", + "m_Title": "Emissive", + "m_Position": { + "x": 10.0, + "y": 10.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", @@ -5093,6 +5091,31 @@ "m_SerializedDescriptor": "VertexDescription.Normal" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "4128891bd0be4de6958b8af95f1c5028", + "m_Id": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", @@ -5204,17 +5227,17 @@ "m_Type": "UnityEditor.ShaderGraph.PropertyNode", "m_ObjectId": "43ec4c59fe154c21b4370f5f8c232940", "m_Group": { - "m_Id": "" + "m_Id": "b9cb8a64160e49bb9f5e8430f13b8fd5" }, "m_Name": "Property", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2030.0, - "y": 614.0, + "x": -2017.0, + "y": 610.0, "width": 145.0, - "height": 34.00006103515625 + "height": 34.0 } }, "m_Slots": [ @@ -5252,7 +5275,7 @@ "m_Type": "UnityEditor.ShaderGraph.KeywordNode", "m_ObjectId": "449e7e107bdf492f80f501dcb3210dca", "m_Group": { - "m_Id": "" + "m_Id": "40e595c48b344276b7ffb990706f83c1" }, "m_Name": "PK_HAS_EMISSIVE", "m_DrawState": { @@ -5281,7 +5304,7 @@ ], "synonyms": [], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5393,10 +5416,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -5362.0, - "y": -146.99996948242188, + "x": -3697.99951171875, + "y": -245.0000457763672, "width": 130.0, - "height": 117.99991607666016 + "height": 118.00001525878906 } }, "m_Slots": [ @@ -5506,17 +5529,17 @@ "m_Type": "UnityEditor.ShaderGraph.CustomFunctionNode", "m_ObjectId": "4919be38f2304a4487d4cc4a716186fe", "m_Group": { - "m_Id": "" + "m_Id": "b9cb8a64160e49bb9f5e8430f13b8fd5" }, "m_Name": "SampleParticleTextureTransformed_Mesh (Custom Function)", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -3301.0, - "y": 379.9999694824219, + "x": -2426.0, + "y": 317.99993896484377, "width": 393.0, - "height": 285.9999694824219 + "height": 286.0 } }, "m_Slots": [ @@ -5569,17 +5592,17 @@ "m_Type": "UnityEditor.ShaderGraph.KeywordNode", "m_ObjectId": "49f190aada1b40e388139767aa5a750e", "m_Group": { - "m_Id": "" + "m_Id": "b9cb8a64160e49bb9f5e8430f13b8fd5" }, "m_Name": "PK_HAS_ALPHA_REMAP", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -838.9998779296875, - "y": 498.0000915527344, - "width": 222.999755859375, - "height": 117.99996948242188 + "x": -893.0001831054688, + "y": 445.0, + "width": 223.0001220703125, + "height": 118.0 } }, "m_Slots": [ @@ -5770,17 +5793,17 @@ "m_Type": "UnityEditor.ShaderGraph.KeywordNode", "m_ObjectId": "4ee7172b36f249f3abe7a812173a9b56", "m_Group": { - "m_Id": "" + "m_Id": "b9cb8a64160e49bb9f5e8430f13b8fd5" }, "m_Name": "PK_HAS_DIFFUSE_RAMP", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1203.9998779296875, - "y": 60.0000114440918, - "width": 207.9998779296875, - "height": 302.0000305175781 + "x": -1323.0, + "y": 67.99999237060547, + "width": 187.0, + "height": 117.99996185302735 } }, "m_Slots": [ @@ -5796,7 +5819,7 @@ ], "synonyms": [], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5855,17 +5878,17 @@ "m_Type": "UnityEditor.ShaderGraph.Vector2Node", "m_ObjectId": "521c9fa2a1e14bbdba649986fe905b13", "m_Group": { - "m_Id": "" + "m_Id": "b9cb8a64160e49bb9f5e8430f13b8fd5" }, "m_Name": "Vector 2", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1796.0001220703125, - "y": 78.00006866455078, - "width": 128.0001220703125, - "height": 101.00003814697266 + "x": -1783.0, + "y": 73.99999237060547, + "width": 128.0, + "height": 100.99999237060547 } }, "m_Slots": [ @@ -5909,9 +5932,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -6685.0, - "y": -454.0000305175781, - "width": 128.00048828125, + "x": -5020.99951171875, + "y": -552.0000610351563, + "width": 128.0, "height": 94.00006103515625 } }, @@ -5977,6 +6000,54 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "546f5a71820842338c0f423b5655f0de", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", @@ -6061,16 +6132,16 @@ "m_Type": "UnityEditor.ShaderGraph.PropertyNode", "m_ObjectId": "56398555c484470e9f269298b5e977a1", "m_Group": { - "m_Id": "" + "m_Id": "b9cb8a64160e49bb9f5e8430f13b8fd5" }, "m_Name": "Property", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1629.0, - "y": 361.00006103515627, - "width": 140.9998779296875, + "x": -1616.0, + "y": 356.99993896484377, + "width": 141.0, "height": 34.00006103515625 } }, @@ -6103,10 +6174,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -5011.8251953125, - "y": 374.4377746582031, - "width": 213.0, - "height": 34.0 + "x": -3347.99951171875, + "y": 275.99993896484377, + "width": 212.999755859375, + "height": 33.999969482421878 } }, "m_Slots": [ @@ -6295,10 +6366,10 @@ "m_Expanded": false, "m_Position": { "serializedVersion": "2", - "x": -6204.99951171875, - "y": -189.00006103515626, - "width": 144.99951171875, - "height": 137.00009155273438 + "x": -4540.99951171875, + "y": -287.00006103515627, + "width": 145.0, + "height": 137.00006103515626 } }, "m_Slots": [ @@ -6347,17 +6418,17 @@ "m_Type": "UnityEditor.ShaderGraph.Vector2Node", "m_ObjectId": "5e8cd61bc78d4580b1e828969c71c5bb", "m_Group": { - "m_Id": "" + "m_Id": "b9cb8a64160e49bb9f5e8430f13b8fd5" }, "m_Name": "Vector 2", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1616.0, - "y": 422.0001220703125, - "width": 127.9998779296875, - "height": 100.9998779296875 + "x": -1603.0, + "y": 418.0, + "width": 128.0, + "height": 101.0 } }, "m_Slots": [ @@ -6425,22 +6496,68 @@ "m_BareResource": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SplitNode", + "m_ObjectId": "5f807f4b33b24f53b240ccb26d7f9e38", + "m_Group": { + "m_Id": "b9cb8a64160e49bb9f5e8430f13b8fd5" + }, + "m_Name": "Split", + "m_DrawState": { + "m_Expanded": false, + "m_Position": { + "serializedVersion": "2", + "x": -1236.9998779296875, + "y": 580.9999389648438, + "width": 118.999755859375, + "height": 77.0 + } + }, + "m_Slots": [ + { + "m_Id": "a015ff45a14a4d56a2fe6b8113624571" + }, + { + "m_Id": "888e3c2584bc474aa1731fdb9f2a342b" + }, + { + "m_Id": "390eba07570f4f3787778dc964ae1a01" + }, + { + "m_Id": "739b0deffad14717914a927df422ecf3" + }, + { + "m_Id": "e6969405e34d404d83ec3a3986e99010" + } + ], + "synonyms": [ + "separate" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", "m_ObjectId": "5fd3cdcf57764872bab3b636cd0886c3", "m_Group": { - "m_Id": "" + "m_Id": "2a526f5273934d0ba941a0d66d32328a" }, "m_Name": "Multiply", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -596.9999389648438, - "y": 1018.0000610351563, - "width": 207.99996948242188, - "height": 302.00006103515627 + "x": -436.9998474121094, + "y": 1017.9999389648438, + "width": 207.99981689453126, + "height": 302.00018310546877 } }, "m_Slots": [ @@ -6460,7 +6577,7 @@ "x" ], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -6511,17 +6628,17 @@ "m_Type": "UnityEditor.ShaderGraph.PropertyNode", "m_ObjectId": "611f16b305374f35ab3c6a970a1ea18d", "m_Group": { - "m_Id": "" + "m_Id": "40e595c48b344276b7ffb990706f83c1" }, "m_Name": "Property", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2201.0, - "y": -653.0, + "x": -1852.0, + "y": -500.00006103515627, "width": 156.0, - "height": 34.00006103515625 + "height": 33.999969482421878 } }, "m_Slots": [ @@ -6546,15 +6663,15 @@ "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode", "m_ObjectId": "61502366c52c4904aa71f7b58746a63c", "m_Group": { - "m_Id": "" + "m_Id": "b9cb8a64160e49bb9f5e8430f13b8fd5" }, "m_Name": "Sample Texture 2D", "m_DrawState": { "m_Expanded": false, "m_Position": { "serializedVersion": "2", - "x": -1578.0, - "y": 26.000104904174806, + "x": -1565.0, + "y": 22.000019073486329, "width": 180.0, "height": 178.9999237060547 } @@ -6671,16 +6788,16 @@ "m_Type": "UnityEditor.ShaderGraph.PropertyNode", "m_ObjectId": "62430be442c54625b0c8973d3f4dafb0", "m_Group": { - "m_Id": "" + "m_Id": "40e595c48b344276b7ffb990706f83c1" }, "m_Name": "Property", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1442.0001220703125, - "y": -427.99993896484377, - "width": 187.000244140625, + "x": -1349.0001220703125, + "y": -423.9999694824219, + "width": 187.0, "height": 33.999969482421878 } }, @@ -6829,17 +6946,17 @@ "m_Type": "UnityEditor.ShaderGraph.SubtractNode", "m_ObjectId": "6652a87dd91f4b5dad7b47e7412bae80", "m_Group": { - "m_Id": "" + "m_Id": "2a526f5273934d0ba941a0d66d32328a" }, "m_Name": "Subtract", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1467.0001220703125, - "y": 864.0000610351563, - "width": 208.0, - "height": 301.99993896484377 + "x": -906.0001220703125, + "y": 1035.0, + "width": 126.0, + "height": 118.0 } }, "m_Slots": [ @@ -6860,7 +6977,7 @@ "take away" ], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -6972,10 +7089,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -6579.0, - "y": -290.0, + "x": -4914.99951171875, + "y": -387.9999694824219, "width": 183.0, - "height": 100.99993896484375 + "height": 100.99990844726563 } }, "m_Slots": [ @@ -7046,40 +7163,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.CustomInterpolatorNode", - "m_ObjectId": "6b80dbc9819f40c5a87d1cf55e29f8ad", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Color (Custom Interpolator)", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -3110.0, - "y": 271.9999694824219, - "width": 202.0, - "height": 94.00009155273438 - } - }, - "m_Slots": [ - { - "m_Id": "94ed592c3bbe49cbb2be51acdd2b1020" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": false, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "customBlockNodeName": "Color", - "serializedType": 4 -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -7092,10 +7175,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -6188.0, - "y": -359.9999694824219, + "x": -4523.99951171875, + "y": -458.0, "width": 144.0, - "height": 33.999908447265628 + "height": 33.999969482421878 } }, "m_Slots": [ @@ -7266,7 +7349,7 @@ ], "synonyms": [], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -7288,10 +7371,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -6862.0, - "y": 357.9999694824219, + "x": -5197.99951171875, + "y": 259.9998779296875, "width": 144.0, - "height": 34.0001220703125 + "height": 33.999969482421878 } }, "m_Slots": [ @@ -7427,6 +7510,21 @@ "m_Space": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "739b0deffad14717914a927df422ecf3", + "m_Id": 3, + "m_DisplayName": "B", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -7471,17 +7569,17 @@ "m_Type": "UnityEditor.ShaderGraph.PropertyNode", "m_ObjectId": "7533e8ad72194d77b939d3d086b80c53", "m_Group": { - "m_Id": "" + "m_Id": "b9cb8a64160e49bb9f5e8430f13b8fd5" }, "m_Name": "Property", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1835.0001220703125, - "y": 9.000081062316895, - "width": 178.0001220703125, - "height": 33.99998092651367 + "x": -1822.0, + "y": 4.999977111816406, + "width": 177.9998779296875, + "height": 34.000022888183597 } }, "m_Slots": [ @@ -7576,10 +7674,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -6354.0, - "y": -365.00006103515627, + "x": -4689.99951171875, + "y": -463.00006103515627, "width": 126.0, - "height": 118.00001525878906 + "height": 118.00003051757813 } }, "m_Slots": [ @@ -7607,16 +7705,16 @@ "m_Type": "UnityEditor.ShaderGraph.SceneDepthNode", "m_ObjectId": "76a2e90761af476aba00b11e1b4d3237", "m_Group": { - "m_Id": "" + "m_Id": "2a526f5273934d0ba941a0d66d32328a" }, "m_Name": "Scene Depth", "m_DrawState": { - "m_Expanded": true, + "m_Expanded": false, "m_Position": { "serializedVersion": "2", - "x": -2228.000244140625, - "y": 738.0000610351563, - "width": 145.0, + "x": -1276.0001220703125, + "y": 906.0, + "width": 145.0001220703125, "height": 112.0 } }, @@ -7633,7 +7731,7 @@ "zdepth" ], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -7689,10 +7787,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -4739.0, - "y": 212.00001525878907, - "width": 237.0, - "height": 237.99998474121095 + "x": -3074.99951171875, + "y": 113.99983978271485, + "width": 236.999755859375, + "height": 238.00009155273438 } }, "m_Slots": [ @@ -7870,17 +7968,17 @@ "m_Type": "UnityEditor.ShaderGraph.SplitNode", "m_ObjectId": "7d700adae4394f0d99597b87bdae3e54", "m_Group": { - "m_Id": "" + "m_Id": "2a526f5273934d0ba941a0d66d32328a" }, "m_Name": "Split", "m_DrawState": { - "m_Expanded": true, + "m_Expanded": false, "m_Position": { "serializedVersion": "2", - "x": -1638.0001220703125, - "y": 1094.0001220703125, - "width": 120.0, - "height": 148.9998779296875 + "x": -1067.0001220703125, + "y": 1098.0, + "width": 119.0, + "height": 77.0 } }, "m_Slots": [ @@ -7904,7 +8002,7 @@ "separate" ], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -7937,17 +8035,17 @@ "m_Type": "UnityEditor.ShaderGraph.PropertyNode", "m_ObjectId": "7e7671785db94a46868f1014b89d1ea8", "m_Group": { - "m_Id": "" + "m_Id": "2a526f5273934d0ba941a0d66d32328a" }, "m_Name": "Property", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1659.0, - "y": 1286.0, + "x": -1109.0001220703125, + "y": 1205.0, "width": 187.0, - "height": 34.0 + "height": 34.0001220703125 } }, "m_Slots": [ @@ -8027,10 +8125,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -6567.0, - "y": 325.99993896484377, + "x": -4902.99951171875, + "y": 227.9999542236328, "width": 183.0, - "height": 101.0001220703125 + "height": 101.00001525878906 } }, "m_Slots": [ @@ -8177,7 +8275,55 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Internal.BooleanShaderProperty", + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "8176455b5cf1489c86583378226ed452", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 2.0, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Internal.BooleanShaderProperty", "m_ObjectId": "8188b9f2d75c4b2e953a82e5990d62b7", "m_Guid": { "m_GuidSerialized": "dbf4cf73-8de2-40c8-9f5f-6329a719672e" @@ -8378,6 +8524,54 @@ "m_BareResource": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "846073eaa0ff42be8abf1a120dbe3ab1", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", @@ -8488,6 +8682,21 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "888e3c2584bc474aa1731fdb9f2a342b", + "m_Id": 1, + "m_DisplayName": "R", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "R", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -8542,13 +8751,13 @@ }, "m_Name": "Normal From Texture", "m_DrawState": { - "m_Expanded": true, + "m_Expanded": false, "m_Position": { "serializedVersion": "2", - "x": 257.0001220703125, - "y": 616.0, - "width": 207.99990844726563, - "height": 374.00006103515627 + "x": 128.0, + "y": 563.0, + "width": 208.0, + "height": 278.0 } }, "m_Slots": [ @@ -8588,17 +8797,17 @@ "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode", "m_ObjectId": "8d0ace9f975c498ba3b7ef85177fffa4", "m_Group": { - "m_Id": "" + "m_Id": "b9cb8a64160e49bb9f5e8430f13b8fd5" }, "m_Name": "Sample Texture 2D", "m_DrawState": { "m_Expanded": false, "m_Position": { "serializedVersion": "2", - "x": -1442.9998779296875, - "y": 344.0001220703125, - "width": 155.999755859375, - "height": 178.9998779296875 + "x": -1430.0, + "y": 340.0, + "width": 155.9998779296875, + "height": 179.0 } }, "m_Slots": [ @@ -8683,17 +8892,17 @@ "m_Type": "UnityEditor.ShaderGraph.OneMinusNode", "m_ObjectId": "8d89a9b06de84628b8dab0895d5f91f3", "m_Group": { - "m_Id": "" + "m_Id": "b9cb8a64160e49bb9f5e8430f13b8fd5" }, "m_Name": "One Minus", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1852.967529296875, - "y": 599.032470703125, - "width": 208.0, - "height": 278.0 + "x": -1840.0, + "y": 594.9999389648438, + "width": 128.0, + "height": 94.0 } }, "m_Slots": [ @@ -8972,10 +9181,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -5011.8251953125, - "y": 340.4377746582031, - "width": 184.0, - "height": 34.0 + "x": -3347.99951171875, + "y": 241.9999542236328, + "width": 183.999755859375, + "height": 33.99998474121094 } }, "m_Slots": [ @@ -9044,10 +9253,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -5702.0, - "y": 477.9999694824219, - "width": 128.0, - "height": 100.99996948242188 + "x": -4037.999755859375, + "y": 379.99993896484377, + "width": 128.000244140625, + "height": 101.00003051757813 } }, "m_Slots": [ @@ -9107,31 +9316,6 @@ "m_SerializedDescriptor": "SurfaceDescription.AlphaClipThreshold" } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", - "m_ObjectId": "94ed592c3bbe49cbb2be51acdd2b1020", - "m_Id": 0, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 2, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -9333,10 +9517,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -5350.0, - "y": 450.0, - "width": 130.00048828125, - "height": 118.0001220703125 + "x": -3685.99951171875, + "y": 351.99993896484377, + "width": 130.0, + "height": 118.00003051757813 } }, "m_Slots": [ @@ -9446,8 +9630,8 @@ "m_ObjectId": "9aa0e3d8a85443fc888e250cec5e066b", "m_Title": "Mesh Texture Atlas UV0", "m_Position": { - "x": -6875.80810546875, - "y": -512.6112060546875 + "x": -5211.99951171875, + "y": -610.9998779296875 } } @@ -9512,10 +9696,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -5957.0, - "y": -220.99998474121095, + "x": -4292.99951171875, + "y": -319.0, "width": 183.0, - "height": 250.99989318847657 + "height": 250.99996948242188 } }, "m_Slots": [ @@ -9743,6 +9927,30 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "a015ff45a14a4d56a2fe6b8113624571", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.UVNode", @@ -9755,10 +9963,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -5718.99951171875, - "y": 227.99996948242188, - "width": 144.99951171875, - "height": 129.0001220703125 + "x": -4054.99951171875, + "y": 129.99990844726563, + "width": 145.0, + "height": 129.00003051757813 } }, "m_Slots": [ @@ -9970,39 +10178,49 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", - "m_ObjectId": "a68d7d24b5dd4a5c8042f51adeb81623", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Multiply", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -2867.0, - "y": 319.00006103515627, - "width": 208.0, - "height": 301.99993896484377 - } + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "a621a073985549c3a91e724c6f943962", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 }, - "m_Slots": [ - { - "m_Id": "c2ce84e597f64bfab31431309e446964" - }, - { - "m_Id": "19f89984df7842e1a7fb2f400317ff0b" - }, - { - "m_Id": "0716815c8a7046dcab37df9acfb86dab" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": false, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 } } @@ -10349,17 +10567,17 @@ "m_Type": "UnityEditor.ShaderGraph.RedirectNodeData", "m_ObjectId": "b2824462469d452fa4799e066d12a242", "m_Group": { - "m_Id": "" + "m_Id": "b9cb8a64160e49bb9f5e8430f13b8fd5" }, "m_Name": "Redirect Node", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1813.0, - "y": 465.0001220703125, - "width": 56.0, - "height": 24.0 + "x": -1800.0001220703125, + "y": 461.0, + "width": 56.0001220703125, + "height": 24.000030517578126 } }, "m_Slots": [ @@ -10413,10 +10631,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -4895.82470703125, - "y": 246.43777465820313, - "width": 127.999755859375, - "height": 94.0 + "x": -3231.999755859375, + "y": 148.00003051757813, + "width": 128.0, + "height": 93.99992370605469 } }, "m_Slots": [ @@ -10469,10 +10687,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -5714.0, - "y": -118.9999771118164, - "width": 128.00048828125, - "height": 100.99994659423828 + "x": -4049.999755859375, + "y": -217.00003051757813, + "width": 128.000244140625, + "height": 101.0000228881836 } }, "m_Slots": [ @@ -10627,6 +10845,44 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "b8a90e4c55b447909026a2eac069266e", + "m_Group": { + "m_Id": "b9cb8a64160e49bb9f5e8430f13b8fd5" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1064.9998779296875, + "y": -34.99999237060547, + "width": 129.9998779296875, + "height": 117.99996185302735 + } + }, + "m_Slots": [ + { + "m_Id": "a621a073985549c3a91e724c6f943962" + }, + { + "m_Id": "8176455b5cf1489c86583378226ed452" + }, + { + "m_Id": "546f5a71820842338c0f423b5655f0de" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Internal.BooleanShaderProperty", @@ -10691,6 +10947,17 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.GroupData", + "m_ObjectId": "b9cb8a64160e49bb9f5e8430f13b8fd5", + "m_Title": "Diffuse + Diffuse ramp + AlphaRemap", + "m_Position": { + "x": -2660.0, + "y": -94.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", @@ -10708,12 +10975,60 @@ "w": 0.0 }, "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_Labels": [] + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "ba9cc04e4f40444d8978d3bfd225aa5c", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } } { @@ -10745,17 +11060,17 @@ "m_Type": "UnityEditor.ShaderGraph.SplitNode", "m_ObjectId": "bb1120aaa396438baa61274fcc245dcb", "m_Group": { - "m_Id": "" + "m_Id": "40e595c48b344276b7ffb990706f83c1" }, "m_Name": "Split", "m_DrawState": { - "m_Expanded": true, + "m_Expanded": false, "m_Position": { "serializedVersion": "2", - "x": -1624.0, - "y": -340.9999694824219, - "width": 119.9998779296875, - "height": 149.0 + "x": -1490.0001220703125, + "y": -376.99993896484377, + "width": 119.0, + "height": 77.0 } }, "m_Slots": [ @@ -10919,10 +11234,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -5944.99951171875, - "y": 375.9999694824219, + "x": -4280.99951171875, + "y": 278.0, "width": 183.0, - "height": 251.00009155273438 + "height": 250.99993896484376 } }, "m_Slots": [ @@ -11144,10 +11459,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -5731.0, - "y": -369.0, - "width": 145.00048828125, - "height": 128.99993896484376 + "x": -4066.99951171875, + "y": -467.0000915527344, + "width": 145.0, + "height": 129.00006103515626 } }, "m_Slots": [ @@ -11177,10 +11492,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -6175.99951171875, - "y": 290.99993896484377, - "width": 127.99951171875, - "height": 101.00015258789063 + "x": -4511.99951171875, + "y": 193.0000457763672, + "width": 128.0, + "height": 100.99980163574219 } }, "m_Slots": [ @@ -11207,54 +11522,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "c2ce84e597f64bfab31431309e446964", - "m_Id": 0, - "m_DisplayName": "A", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "A", - "m_StageCapability": 3, - "m_Value": { - "e00": 0.0, - "e01": 0.0, - "e02": 0.0, - "e03": 0.0, - "e10": 0.0, - "e11": 0.0, - "e12": 0.0, - "e13": 0.0, - "e20": 0.0, - "e21": 0.0, - "e22": 0.0, - "e23": 0.0, - "e30": 0.0, - "e31": 0.0, - "e32": 0.0, - "e33": 0.0 - }, - "m_DefaultValue": { - "e00": 1.0, - "e01": 0.0, - "e02": 0.0, - "e03": 0.0, - "e10": 0.0, - "e11": 1.0, - "e12": 0.0, - "e13": 0.0, - "e20": 0.0, - "e21": 0.0, - "e22": 1.0, - "e23": 0.0, - "e30": 0.0, - "e31": 0.0, - "e32": 0.0, - "e33": 1.0 - } -} - { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", @@ -11392,17 +11659,17 @@ "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", "m_ObjectId": "c7516793c55d4c739b8d354bb8f6b44f", "m_Group": { - "m_Id": "" + "m_Id": "40e595c48b344276b7ffb990706f83c1" }, "m_Name": "Multiply", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1877.0, - "y": -553.9999389648438, - "width": 208.0, - "height": 302.0 + "x": -1668.0, + "y": -542.0000610351563, + "width": 130.0, + "height": 118.0 } }, "m_Slots": [ @@ -11422,7 +11689,7 @@ "x" ], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -11464,10 +11731,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -6673.0, - "y": 138.0000457763672, + "x": -5008.99951171875, + "y": 39.999900817871097, "width": 128.0, - "height": 93.99993896484375 + "height": 94.00012969970703 } }, "m_Slots": [ @@ -11487,6 +11754,54 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "c98fac7935f340f68c41852ad0ac7fee", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 2.0, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", @@ -11681,10 +11996,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -6175.99951171875, - "y": 231.99998474121095, - "width": 143.99951171875, - "height": 33.99995422363281 + "x": -4511.99951171875, + "y": 134.00003051757813, + "width": 144.0, + "height": 33.99998474121094 } }, "m_Slots": [ @@ -11934,16 +12249,16 @@ "m_Type": "UnityEditor.ShaderGraph.CustomFunctionNode", "m_ObjectId": "d6b76c06d6894892b452c0be5f457f5c", "m_Group": { - "m_Id": "" + "m_Id": "40e595c48b344276b7ffb990706f83c1" }, "m_Name": "SampleParticleTextureTransformed_Mesh (Custom Function)", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -3423.0, - "y": -526.0, - "width": 393.0, + "x": -2278.0, + "y": -500.0000305175781, + "width": 393.000244140625, "height": 286.0000305175781 } }, @@ -12141,10 +12456,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -6851.0, - "y": -419.0000305175781, + "x": -5186.99951171875, + "y": -517.0, "width": 116.0, - "height": 34.000030517578128 + "height": 33.999969482421878 } }, "m_Slots": [ @@ -12193,17 +12508,17 @@ "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode", "m_ObjectId": "db0929cbb3c542c6b1934a5343d0b360", "m_Group": { - "m_Id": "" + "m_Id": "40e595c48b344276b7ffb990706f83c1" }, "m_Name": "Sample Texture 2D", "m_DrawState": { - "m_Expanded": true, + "m_Expanded": false, "m_Position": { "serializedVersion": "2", - "x": -1205.0, - "y": -393.9999694824219, - "width": 207.9998779296875, - "height": 434.9999694824219 + "x": -1149.0001220703125, + "y": -466.0, + "width": 183.0, + "height": 251.0 } }, "m_Slots": [ @@ -12234,7 +12549,7 @@ ], "synonyms": [], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -12375,10 +12690,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -6330.99951171875, - "y": 238.99998474121095, + "x": -4666.99951171875, + "y": 140.9999237060547, "width": 126.0, - "height": 118.00010681152344 + "height": 118.00001525878906 } }, "m_Slots": [ @@ -12464,10 +12779,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -5714.0, - "y": -220.00001525878907, - "width": 128.00048828125, - "height": 101.00003814697266 + "x": -4049.999755859375, + "y": -318.00006103515627, + "width": 128.000244140625, + "height": 101.00003051757813 } }, "m_Slots": [ @@ -12544,10 +12859,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -5702.0, - "y": 377.0000305175781, - "width": 128.0, - "height": 100.99993896484375 + "x": -4037.999755859375, + "y": 278.9999084472656, + "width": 128.000244140625, + "height": 101.00003051757813 } }, "m_Slots": [ @@ -12694,6 +13009,21 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "e6969405e34d404d83ec3a3986e99010", + "m_Id": 4, + "m_DisplayName": "A", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -12721,9 +13051,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -86.0, - "y": 737.0, - "width": 149.0000762939453, + "x": -46.0, + "y": 597.0, + "width": 149.0, "height": 34.0 } }, @@ -12818,15 +13148,15 @@ "m_Type": "UnityEditor.ShaderGraph.PropertyNode", "m_ObjectId": "ea4848f124e24fc89a22c53b3cf5fb9a", "m_Group": { - "m_Id": "" + "m_Id": "b9cb8a64160e49bb9f5e8430f13b8fd5" }, "m_Name": "Property", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -3495.0, - "y": 403.00006103515627, + "x": -2620.0, + "y": 341.0000305175781, "width": 149.0, "height": 33.999969482421878 } @@ -12853,17 +13183,17 @@ "m_Type": "UnityEditor.ShaderGraph.CameraNode", "m_ObjectId": "ea6deb6641cf4f71bd68c69be5290392", "m_Group": { - "m_Id": "" + "m_Id": "2a526f5273934d0ba941a0d66d32328a" }, "m_Name": "Camera", "m_DrawState": { - "m_Expanded": true, + "m_Expanded": false, "m_Position": { "serializedVersion": "2", - "x": -2228.000244140625, - "y": 875.0000610351563, - "width": 122.0, - "height": 244.99993896484376 + "x": -1276.0001220703125, + "y": 1021.0, + "width": 102.0001220703125, + "height": 77.0 } }, "m_Slots": [ @@ -12902,7 +13232,7 @@ "height" ], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -13065,10 +13395,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -5542.0, - "y": -246.0, + "x": -3877.99951171875, + "y": -344.0, "width": 130.0, - "height": 117.99992370605469 + "height": 118.0 } }, "m_Slots": [ @@ -13096,17 +13426,17 @@ "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", "m_ObjectId": "edb8e3d944e848068b5b2032c4d85ff1", "m_Group": { - "m_Id": "" + "m_Id": "2a526f5273934d0ba941a0d66d32328a" }, "m_Name": "Multiply", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1992.0001220703125, - "y": 864.0000610351563, - "width": 208.0, - "height": 301.99993896484377 + "x": -1067.0, + "y": 976.0, + "width": 125.9998779296875, + "height": 118.0 } }, "m_Slots": [ @@ -13126,7 +13456,7 @@ "x" ], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -13454,17 +13784,17 @@ "m_Type": "UnityEditor.ShaderGraph.ScreenPositionNode", "m_ObjectId": "f34c4e1755c7427799e76f80c8967777", "m_Group": { - "m_Id": "" + "m_Id": "2a526f5273934d0ba941a0d66d32328a" }, "m_Name": "Screen Position", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1945.0001220703125, - "y": 1205.0001220703125, - "width": 208.0, - "height": 313.0 + "x": -1276.0001220703125, + "y": 1098.0, + "width": 145.0, + "height": 129.0001220703125 } }, "m_Slots": [ @@ -13474,7 +13804,7 @@ ], "synonyms": [], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -13495,6 +13825,40 @@ "m_BareResource": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CustomInterpolatorNode", + "m_ObjectId": "f4007ace6d05434eb23944ad2e19cb6b", + "m_Group": { + "m_Id": "b9cb8a64160e49bb9f5e8430f13b8fd5" + }, + "m_Name": "Color (Custom Interpolator)", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1437.0001220703125, + "y": 224.0000457763672, + "width": 202.0, + "height": 93.99989318847656 + } + }, + "m_Slots": [ + { + "m_Id": "4128891bd0be4de6958b8af95f1c5028" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "customBlockNodeName": "Color", + "serializedType": 4 +} + { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.ShaderKeyword", @@ -13639,17 +14003,17 @@ "m_Type": "UnityEditor.ShaderGraph.PropertyNode", "m_ObjectId": "f9e3900fd4934c6ebfb541e0edbe9ea2", "m_Group": { - "m_Id": "" + "m_Id": "40e595c48b344276b7ffb990706f83c1" }, "m_Name": "Property", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -3656.0, - "y": -336.9999694824219, + "x": -2515.999755859375, + "y": -320.9999694824219, "width": 209.0, - "height": 34.0 + "height": 34.000091552734378 } }, "m_Slots": [ @@ -13750,6 +14114,48 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "fb792138ed944d319e0f026d2ff55e76", + "m_Group": { + "m_Id": "b9cb8a64160e49bb9f5e8430f13b8fd5" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1045.0, + "y": 520.0, + "width": 126.0, + "height": 117.99993896484375 + } + }, + "m_Slots": [ + { + "m_Id": "846073eaa0ff42be8abf1a120dbe3ab1" + }, + { + "m_Id": "c98fac7935f340f68c41852ad0ac7fee" + }, + { + "m_Id": "ba9cc04e4f40444d8978d3bfd225aa5c" + } + ], + "synonyms": [ + "multiplication", + "times", + "x" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", @@ -13802,10 +14208,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -6862.0, - "y": 177.9999237060547, + "x": -5197.99951171875, + "y": 79.9998550415039, "width": 116.0, - "height": 34.0001220703125 + "height": 33.99998474121094 } }, "m_Slots": [ diff --git a/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Mesh_UnlitOpaque.shadergraph b/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Mesh_UnlitOpaque.shadergraph index fa9b28fd..8c63eeb3 100644 --- a/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Mesh_UnlitOpaque.shadergraph +++ b/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Mesh_UnlitOpaque.shadergraph @@ -160,9 +160,6 @@ { "m_Id": "b2731da8fe4e45ebb9b099b3a8e3a529" }, - { - "m_Id": "1d0373ba5c3e4c428f5090802d12e7f5" - }, { "m_Id": "e53d98bc05964905b0b6fa9ea7de02e3" }, @@ -343,9 +340,6 @@ { "m_Id": "f4efd5bde1d04bfdaa239f66bc0b73bd" }, - { - "m_Id": "7bedc540e4fb453a98909a3bd7165719" - }, { "m_Id": "ff47d8737ac54ff08e481a93d0ae8ade" }, @@ -366,6 +360,18 @@ }, { "m_Id": "386d1157ccde435286917ecf85a2de5f" + }, + { + "m_Id": "37a81d184805419990d49519e5521a8c" + }, + { + "m_Id": "7cabc3f627f14be08a6ecb8330aec995" + }, + { + "m_Id": "2b71681fb75244eaaeeee180d70cbac5" + }, + { + "m_Id": "5222325232ef4add960868f72db1480c" } ], "m_GroupDatas": [ @@ -507,13 +513,13 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "1d0373ba5c3e4c428f5090802d12e7f5" + "m_Id": "22fb64a5c35b4d4b879b0b1edf16be8e" }, "m_SlotId": 2 }, "m_InputSlot": { "m_Node": { - "m_Id": "549fdbf940b24f5ebe5b720bb0733c26" + "m_Id": "2522bf4ff5644187aa4238b286e98ad8" }, "m_SlotId": 0 } @@ -521,83 +527,83 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "1d0373ba5c3e4c428f5090802d12e7f5" + "m_Id": "22fb64a5c35b4d4b879b0b1edf16be8e" }, "m_SlotId": 2 }, "m_InputSlot": { "m_Node": { - "m_Id": "76758991536c445b90457fcd0933e8dd" + "m_Id": "508907660aa1474691604b990c2d9020" }, - "m_SlotId": 2 + "m_SlotId": 1 } }, { "m_OutputSlot": { "m_Node": { - "m_Id": "22fb64a5c35b4d4b879b0b1edf16be8e" + "m_Id": "2522bf4ff5644187aa4238b286e98ad8" }, - "m_SlotId": 2 + "m_SlotId": 1 }, "m_InputSlot": { "m_Node": { - "m_Id": "2522bf4ff5644187aa4238b286e98ad8" + "m_Id": "ab9ca6d8059948dd84c46e410afd9078" }, - "m_SlotId": 0 + "m_SlotId": 1 } }, { "m_OutputSlot": { "m_Node": { - "m_Id": "22fb64a5c35b4d4b879b0b1edf16be8e" + "m_Id": "2b71681fb75244eaaeeee180d70cbac5" }, - "m_SlotId": 2 + "m_SlotId": 4 }, "m_InputSlot": { "m_Node": { - "m_Id": "508907660aa1474691604b990c2d9020" + "m_Id": "5222325232ef4add960868f72db1480c" }, - "m_SlotId": 1 + "m_SlotId": 0 } }, { "m_OutputSlot": { "m_Node": { - "m_Id": "2522bf4ff5644187aa4238b286e98ad8" + "m_Id": "34c612b9b96540df8eb923cc345d98e6" }, - "m_SlotId": 1 + "m_SlotId": 2 }, "m_InputSlot": { "m_Node": { - "m_Id": "ab9ca6d8059948dd84c46e410afd9078" + "m_Id": "9fc6525c0da04804be300d6434d91001" }, - "m_SlotId": 1 + "m_SlotId": 0 } }, { "m_OutputSlot": { "m_Node": { - "m_Id": "34c612b9b96540df8eb923cc345d98e6" + "m_Id": "36b0bfea26424cb58b806a7c003ebff7" }, - "m_SlotId": 2 + "m_SlotId": 0 }, "m_InputSlot": { "m_Node": { - "m_Id": "9fc6525c0da04804be300d6434d91001" + "m_Id": "084d20503b4a4971ab81b8bb41832cce" }, - "m_SlotId": 0 + "m_SlotId": 1 } }, { "m_OutputSlot": { "m_Node": { - "m_Id": "36b0bfea26424cb58b806a7c003ebff7" + "m_Id": "37a81d184805419990d49519e5521a8c" }, - "m_SlotId": 0 + "m_SlotId": 2 }, "m_InputSlot": { "m_Node": { - "m_Id": "084d20503b4a4971ab81b8bb41832cce" + "m_Id": "34c612b9b96540df8eb923cc345d98e6" }, "m_SlotId": 1 } @@ -784,6 +790,20 @@ "m_SlotId": 3 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "5222325232ef4add960868f72db1480c" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "db2998e9b78442d0b6f03def525ab896" + }, + "m_SlotId": 2 + } + }, { "m_OutputSlot": { "m_Node": { @@ -807,9 +827,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "9140d31cbb234bac8b65e2ead5c983cf" + "m_Id": "5222325232ef4add960868f72db1480c" }, - "m_SlotId": 0 + "m_SlotId": 1 } }, { @@ -821,9 +841,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "db2998e9b78442d0b6f03def525ab896" + "m_Id": "9140d31cbb234bac8b65e2ead5c983cf" }, - "m_SlotId": 2 + "m_SlotId": 0 } }, { @@ -961,7 +981,7 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "34c612b9b96540df8eb923cc345d98e6" + "m_Id": "37a81d184805419990d49519e5521a8c" }, "m_SlotId": 1 } @@ -1025,13 +1045,27 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "7bedc540e4fb453a98909a3bd7165719" + "m_Id": "7cabc3f627f14be08a6ecb8330aec995" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "2b71681fb75244eaaeeee180d70cbac5" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "7cabc3f627f14be08a6ecb8330aec995" }, "m_SlotId": 0 }, "m_InputSlot": { "m_Node": { - "m_Id": "1d0373ba5c3e4c428f5090802d12e7f5" + "m_Id": "37a81d184805419990d49519e5521a8c" }, "m_SlotId": 0 } @@ -1227,9 +1261,23 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "1d0373ba5c3e4c428f5090802d12e7f5" + "m_Id": "549fdbf940b24f5ebe5b720bb0733c26" }, - "m_SlotId": 1 + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "b7702bb030304be18c4411c415022bb9" + }, + "m_SlotId": 4 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "76758991536c445b90457fcd0933e8dd" + }, + "m_SlotId": 2 } }, { @@ -2584,54 +2632,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "141aa8c0d77c4c7aa1fd11ca01818a0b", - "m_Id": 1, - "m_DisplayName": "B", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "B", - "m_StageCapability": 3, - "m_Value": { - "e00": 2.0, - "e01": 2.0, - "e02": 2.0, - "e03": 2.0, - "e10": 2.0, - "e11": 2.0, - "e12": 2.0, - "e13": 2.0, - "e20": 2.0, - "e21": 2.0, - "e22": 2.0, - "e23": 2.0, - "e30": 2.0, - "e31": 2.0, - "e32": 2.0, - "e33": 2.0 - }, - "m_DefaultValue": { - "e00": 1.0, - "e01": 0.0, - "e02": 0.0, - "e03": 0.0, - "e10": 0.0, - "e11": 1.0, - "e12": 0.0, - "e13": 0.0, - "e20": 0.0, - "e21": 0.0, - "e22": 1.0, - "e23": 0.0, - "e30": 0.0, - "e31": 0.0, - "e32": 0.0, - "e33": 1.0 - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalUnlitSubTarget", @@ -2751,31 +2751,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", - "m_ObjectId": "16c13faec4614db38ea9a5648da7e249", - "m_Id": 0, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 2, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -3075,44 +3050,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", - "m_ObjectId": "1d0373ba5c3e4c428f5090802d12e7f5", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Multiply", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -2805.0, - "y": 1136.9998779296875, - "width": 130.0, - "height": 118.0001220703125 - } - }, - "m_Slots": [ - { - "m_Id": "cc60cb4a5dd647c3a22d99a315672496" - }, - { - "m_Id": "141aa8c0d77c4c7aa1fd11ca01818a0b" - }, - { - "m_Id": "469f1635ab8f46b290cef14704b8d466" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": false, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -3412,6 +3349,52 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SplitNode", + "m_ObjectId": "2b71681fb75244eaaeeee180d70cbac5", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Split", + "m_DrawState": { + "m_Expanded": false, + "m_Position": { + "serializedVersion": "2", + "x": -997.0, + "y": 1167.0, + "width": 119.0, + "height": 77.0 + } + }, + "m_Slots": [ + { + "m_Id": "c9969799c4f841ffbb65a55b552dc887" + }, + { + "m_Id": "f398213b0c4441e4b2700abb9c433b4f" + }, + { + "m_Id": "53416d091c7d4ebb869b84a2a586aa9d" + }, + { + "m_Id": "63c66f949272471ab400ef9890cae237" + }, + { + "m_Id": "dc2fd79e159540cf9b0a93e13feecc53" + } + ], + "synonyms": [ + "separate" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -3438,19 +3421,67 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "2cb8759cdca944b58ad7c1f02e49c8ca", - "m_Id": 1, - "m_DisplayName": "True", + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "2ca49679a2d0487cb0d58ad4a2d02fae", + "m_Id": 0, + "m_DisplayName": "A", "m_SlotType": 0, "m_Hidden": false, - "m_ShaderOutputName": "True", + "m_ShaderOutputName": "A", "m_StageCapability": 3, "m_Value": { - "x": 1.0, - "y": 1.0, - "z": 1.0, - "w": 1.0 + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "2cb8759cdca944b58ad7c1f02e49c8ca", + "m_Id": 1, + "m_DisplayName": "True", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "True", + "m_StageCapability": 3, + "m_Value": { + "x": 1.0, + "y": 1.0, + "z": 1.0, + "w": 1.0 }, "m_DefaultValue": { "x": 0.0, @@ -4122,6 +4153,44 @@ "m_DefaultType": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "37a81d184805419990d49519e5521a8c", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -997.0, + "y": 1039.0, + "width": 129.99993896484376, + "height": 118.0 + } + }, + "m_Slots": [ + { + "m_Id": "e4af6ae5fb7e413c9822fd1b9841e47d" + }, + { + "m_Id": "694fb87ddf524b788a296580e634c6ea" + }, + { + "m_Id": "ed6272ce6bec4e969cb43eb81c61bab3" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", @@ -4623,54 +4692,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "469f1635ab8f46b290cef14704b8d466", - "m_Id": 2, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": { - "e00": 0.0, - "e01": 0.0, - "e02": 0.0, - "e03": 0.0, - "e10": 0.0, - "e11": 0.0, - "e12": 0.0, - "e13": 0.0, - "e20": 0.0, - "e21": 0.0, - "e22": 0.0, - "e23": 0.0, - "e30": 0.0, - "e31": 0.0, - "e32": 0.0, - "e33": 0.0 - }, - "m_DefaultValue": { - "e00": 1.0, - "e01": 0.0, - "e02": 0.0, - "e03": 0.0, - "e10": 0.0, - "e11": 1.0, - "e12": 0.0, - "e13": 0.0, - "e20": 0.0, - "e21": 0.0, - "e22": 1.0, - "e23": 0.0, - "e30": 0.0, - "e31": 0.0, - "e32": 0.0, - "e33": 1.0 - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -5202,6 +5223,48 @@ "m_aniso": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "5222325232ef4add960868f72db1480c", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -849.9674682617188, + "y": 1361.0325927734375, + "width": 208.0, + "height": 302.0 + } + }, + "m_Slots": [ + { + "m_Id": "2ca49679a2d0487cb0d58ad4a2d02fae" + }, + { + "m_Id": "bb9b6770d6e44e769d870107d0da6721" + }, + { + "m_Id": "6a29ba53d11a4ddf885817e07ba98b0a" + } + ], + "synonyms": [ + "multiplication", + "times", + "x" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", @@ -5215,6 +5278,21 @@ "m_BareResource": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "53416d091c7d4ebb869b84a2a586aa9d", + "m_Id": 2, + "m_DisplayName": "G", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "G", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -5930,6 +6008,21 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "63c66f949272471ab400ef9890cae237", + "m_Id": 3, + "m_DisplayName": "B", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", @@ -6101,6 +6194,54 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "694fb87ddf524b788a296580e634c6ea", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 2.0, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -6140,6 +6281,54 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "6a29ba53d11a4ddf885817e07ba98b0a", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector2Node", @@ -6455,6 +6644,31 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "752893b6a43d4bda842405f33da3b874", + "m_Id": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -6561,7 +6775,7 @@ ], "synonyms": [], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -6832,40 +7046,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.CustomInterpolatorNode", - "m_ObjectId": "7bedc540e4fb453a98909a3bd7165719", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Color (Custom Interpolator)", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -3074.0, - "y": 1116.0, - "width": 202.0, - "height": 94.0 - } - }, - "m_Slots": [ - { - "m_Id": "16c13faec4614db38ea9a5648da7e249" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": false, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "customBlockNodeName": "Color", - "serializedType": 4 -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", @@ -6884,8 +7064,42 @@ "x": 0.0, "y": 0.0 }, - "m_Labels": [], - "m_Channel": 0 + "m_Labels": [], + "m_Channel": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CustomInterpolatorNode", + "m_ObjectId": "7cabc3f627f14be08a6ecb8330aec995", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Color (Custom Interpolator)", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1226.0, + "y": 1017.0000610351563, + "width": 202.0, + "height": 93.99993896484375 + } + }, + "m_Slots": [ + { + "m_Id": "752893b6a43d4bda842405f33da3b874" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "customBlockNodeName": "Color", + "serializedType": 4 } { @@ -8707,6 +8921,54 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "bb9b6770d6e44e769d870107d0da6721", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 2.0, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", @@ -9128,6 +9390,30 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "c9969799c4f841ffbb65a55b552dc887", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -9143,54 +9429,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "cc60cb4a5dd647c3a22d99a315672496", - "m_Id": 0, - "m_DisplayName": "A", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "A", - "m_StageCapability": 3, - "m_Value": { - "e00": 0.0, - "e01": 0.0, - "e02": 0.0, - "e03": 0.0, - "e10": 0.0, - "e11": 0.0, - "e12": 0.0, - "e13": 0.0, - "e20": 0.0, - "e21": 0.0, - "e22": 0.0, - "e23": 0.0, - "e30": 0.0, - "e31": 0.0, - "e32": 0.0, - "e33": 0.0 - }, - "m_DefaultValue": { - "e00": 1.0, - "e01": 0.0, - "e02": 0.0, - "e03": 0.0, - "e10": 0.0, - "e11": 1.0, - "e12": 0.0, - "e13": 0.0, - "e20": 0.0, - "e21": 0.0, - "e22": 1.0, - "e23": 0.0, - "e30": 0.0, - "e31": 0.0, - "e32": 0.0, - "e33": 1.0 - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -9584,10 +9822,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -867.0, - "y": 1553.0, - "width": 223.00006103515626, - "height": 118.0001220703125 + "x": -678.0, + "y": 1544.0, + "width": 222.99996948242188, + "height": 118.0 } }, "m_Slots": [ @@ -9613,6 +9851,21 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "dc2fd79e159540cf9b0a93e13feecc53", + "m_Id": 4, + "m_DisplayName": "A", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.CustomFunctionNode", @@ -9924,6 +10177,54 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "e4af6ae5fb7e413c9822fd1b9841e47d", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode", @@ -9970,7 +10271,7 @@ ], "synonyms": [], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -10202,6 +10503,54 @@ "m_DefaultType": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "ed6272ce6bec4e969cb43eb81c61bab3", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", @@ -10447,6 +10796,21 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "f398213b0c4441e4b2700abb9c433b4f", + "m_Id": 1, + "m_DisplayName": "R", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "R", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", diff --git a/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Mesh_UnlitTransparent.shadergraph b/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Mesh_UnlitTransparent.shadergraph index 3173cec9..0237eb8b 100644 --- a/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Mesh_UnlitTransparent.shadergraph +++ b/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Mesh_UnlitTransparent.shadergraph @@ -145,9 +145,6 @@ { "m_Id": "49f190aada1b40e388139767aa5a750e" }, - { - "m_Id": "b2824462469d452fa4799e066d12a242" - }, { "m_Id": "4ee7172b36f249f3abe7a812173a9b56" }, @@ -378,6 +375,12 @@ }, { "m_Id": "6fd94fd8b7f44c0183cb9121fc98709c" + }, + { + "m_Id": "ef131bcab11e4a408881c9899334fe1b" + }, + { + "m_Id": "c61698c85c2a49509dd215459aa07e60" } ], "m_GroupDatas": [ @@ -455,9 +458,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "49f190aada1b40e388139767aa5a750e" + "m_Id": "5e8cd61bc78d4580b1e828969c71c5bb" }, - "m_SlotId": 2 + "m_SlotId": 1 } }, { @@ -469,9 +472,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "b2824462469d452fa4799e066d12a242" + "m_Id": "c61698c85c2a49509dd215459aa07e60" }, - "m_SlotId": 0 + "m_SlotId": 1 } }, { @@ -611,6 +614,20 @@ "m_Node": { "m_Id": "3ff85b67ff9e4c5d9aa6dfd768dd8ef0" }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "3782a8a7e5064849b4643f6846761f36" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "ef131bcab11e4a408881c9899334fe1b" + }, "m_SlotId": 0 } }, @@ -651,9 +668,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "6fd94fd8b7f44c0183cb9121fc98709c" + "m_Id": "387a962203d5447ca6c25587e3ee51da" }, - "m_SlotId": 0 + "m_SlotId": 1 } }, { @@ -735,9 +752,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "387a962203d5447ca6c25587e3ee51da" + "m_Id": "3ff85b67ff9e4c5d9aa6dfd768dd8ef0" }, - "m_SlotId": 1 + "m_SlotId": 0 } }, { @@ -1412,20 +1429,6 @@ "m_SlotId": 0 } }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "b2824462469d452fa4799e066d12a242" - }, - "m_SlotId": 1 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "5e8cd61bc78d4580b1e828969c71c5bb" - }, - "m_SlotId": 1 - } - }, { "m_OutputSlot": { "m_Node": { @@ -1706,6 +1709,20 @@ "m_SlotId": 2 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "c61698c85c2a49509dd215459aa07e60" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "49f190aada1b40e388139767aa5a750e" + }, + "m_SlotId": 2 + } + }, { "m_OutputSlot": { "m_Node": { @@ -1869,9 +1886,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "3ff85b67ff9e4c5d9aa6dfd768dd8ef0" + "m_Id": "6fd94fd8b7f44c0183cb9121fc98709c" }, - "m_SlotId": 1 + "m_SlotId": 0 } }, { @@ -1916,6 +1933,20 @@ "m_SlotId": 1 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "ef131bcab11e4a408881c9899334fe1b" + }, + "m_SlotId": 4 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "c61698c85c2a49509dd215459aa07e60" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -2297,6 +2328,21 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "06ab797e4c1148bd93aff5d69b79aef2", + "m_Id": 3, + "m_DisplayName": "B", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", @@ -2432,6 +2478,21 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "0a1988da0f2140fe8ee44aa8c7cc4f80", + "m_Id": 1, + "m_DisplayName": "R", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "R", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", @@ -2480,6 +2541,54 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "0bdc66689e684867b947c578db6f1730", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", @@ -2591,30 +2700,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "10e07a4dc40a40d288308fa9f5bab294", - "m_Id": 1, - "m_DisplayName": "", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", @@ -3864,9 +3949,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1446.0001220703125, - "y": 1209.0001220703125, - "width": 126.0, + "x": -1343.0, + "y": 1216.9998779296875, + "width": 126.0001220703125, "height": 77.0 } }, @@ -4034,10 +4119,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -912.0001220703125, - "y": 1120.0, - "width": 208.00006103515626, - "height": 326.0 + "x": -808.9998779296875, + "y": 1128.0, + "width": 207.9998779296875, + "height": 325.9998779296875 } }, "m_Slots": [ @@ -4216,10 +4301,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -3377.999755859375, - "y": 185.9999542236328, - "width": 201.999755859375, - "height": 93.99995422363281 + "x": -1207.9998779296875, + "y": 178.0000457763672, + "width": 201.99981689453126, + "height": 94.00001525878906 } }, "m_Slots": [ @@ -4541,9 +4626,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1195.0001220703125, - "y": 1131.0001220703125, - "width": 208.0, + "x": -1091.9998779296875, + "y": 1139.0, + "width": 207.9998779296875, "height": 302.0 } }, @@ -4583,10 +4668,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -3105.999755859375, - "y": 204.9999542236328, + "x": -936.0000610351563, + "y": 106.0000228881836, "width": 130.0, - "height": 117.99998474121094 + "height": 117.99999237060547 } }, "m_Slots": [ @@ -4798,6 +4883,21 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "43882cc4a1054cf09b733d419324e616", + "m_Id": 4, + "m_DisplayName": "A", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -4810,10 +4910,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2030.0, - "y": 621.0, + "x": -1813.0001220703125, + "y": 712.0000610351563, "width": 145.0, - "height": 34.0 + "height": 33.99993896484375 } }, "m_Slots": [ @@ -5019,10 +5119,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -838.9998779296875, - "y": 498.0000915527344, - "width": 222.999755859375, - "height": 117.99996948242188 + "x": -600.9998779296875, + "y": 503.0000305175781, + "width": 222.99990844726563, + "height": 118.00003051757813 } }, "m_Slots": [ @@ -5336,7 +5436,7 @@ ], "synonyms": [], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5542,6 +5642,30 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "52ee95c9cca940efa5f0796c129a45a0", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -5692,9 +5816,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1629.0, - "y": 361.00006103515627, - "width": 140.9998779296875, + "x": -1498.0, + "y": 584.0, + "width": 141.0, "height": 34.00006103515625 } }, @@ -5818,6 +5942,21 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "59e2af6d9a894fe49bffa238473abfb8", + "m_Id": 2, + "m_DisplayName": "G", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "G", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -5935,10 +6074,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1616.0, - "y": 422.0001220703125, - "width": 127.9998779296875, - "height": 100.9998779296875 + "x": -1485.0001220703125, + "y": 645.0000610351563, + "width": 128.0001220703125, + "height": 100.99993896484375 } }, "m_Slots": [ @@ -6037,10 +6176,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -596.9999389648438, - "y": 1018.0000610351563, - "width": 207.99996948242188, - "height": 302.00006103515627 + "x": -494.00006103515627, + "y": 1026.0, + "width": 208.00015258789063, + "height": 302.0 } }, "m_Slots": [ @@ -6462,10 +6601,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1467.0001220703125, - "y": 864.0000610351563, - "width": 208.0, - "height": 301.99993896484377 + "x": -1363.9998779296875, + "y": 871.9998779296875, + "width": 207.9998779296875, + "height": 302.0 } }, "m_Slots": [ @@ -6914,10 +7053,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -344.0, - "y": 685.0000610351563, - "width": 207.9999542236328, - "height": 302.0 + "x": -240.99996948242188, + "y": 693.0, + "width": 207.99990844726563, + "height": 301.99993896484377 } }, "m_Slots": [ @@ -6978,10 +7117,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2111.0, - "y": 256.0, + "x": -2134.0, + "y": 336.99993896484377, "width": 56.0, - "height": 24.0 + "height": 24.000030517578126 } }, "m_Slots": [ @@ -7376,10 +7515,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2228.000244140625, - "y": 738.0000610351563, - "width": 145.0, - "height": 112.0 + "x": -2124.999755859375, + "y": 746.0, + "width": 144.9998779296875, + "height": 111.99993896484375 } }, "m_Slots": [ @@ -7618,9 +7757,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1638.0001220703125, - "y": 1094.0001220703125, - "width": 120.0, + "x": -1535.0, + "y": 1102.0, + "width": 120.0001220703125, "height": 148.9998779296875 } }, @@ -7768,10 +7907,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1659.0, - "y": 1286.0, + "x": -1555.9998779296875, + "y": 1293.9998779296875, "width": 187.0, - "height": 34.0 + "height": 34.0001220703125 } }, "m_Slots": [ @@ -7952,6 +8091,54 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "80beb68cd23549f786bac20aee87ebf1", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -8052,10 +8239,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1843.0, - "y": 599.0, - "width": 208.0, - "height": 278.0 + "x": -1668.0001220703125, + "y": 668.0000610351563, + "width": 128.0001220703125, + "height": 94.0 } }, "m_Slots": [ @@ -8283,10 +8470,10 @@ "m_Expanded": false, "m_Position": { "serializedVersion": "2", - "x": -1442.9998779296875, - "y": 344.0001220703125, - "width": 155.999755859375, - "height": 178.9998779296875 + "x": -1312.0, + "y": 567.0, + "width": 155.9998779296875, + "height": 179.0 } }, "m_Slots": [ @@ -9129,6 +9316,54 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "a1576539b4a44cd4b70bd5110160340f", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 2.0, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -9597,41 +9832,6 @@ "m_SerializedDescriptor": "SurfaceDescription.Alpha" } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.RedirectNodeData", - "m_ObjectId": "b2824462469d452fa4799e066d12a242", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Redirect Node", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -1813.0, - "y": 465.0001220703125, - "width": 56.0, - "height": 24.0 - } - }, - "m_Slots": [ - { - "m_Id": "c109c04e05944dcb85d3f9333d9c7dcc" - }, - { - "m_Id": "10e07a4dc40a40d288308fa9f5bab294" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", @@ -10042,30 +10242,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "c109c04e05944dcb85d3f9333d9c7dcc", - "m_Id": 0, - "m_DisplayName": "", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.CustomFunctionNode", @@ -10323,6 +10499,48 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "c61698c85c2a49509dd215459aa07e60", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -820.4500122070313, + "y": 408.5499267578125, + "width": 208.0, + "height": 302.0 + } + }, + "m_Slots": [ + { + "m_Id": "80beb68cd23549f786bac20aee87ebf1" + }, + { + "m_Id": "a1576539b4a44cd4b70bd5110160340f" + }, + { + "m_Id": "0bdc66689e684867b947c578db6f1730" + } + ], + "synonyms": [ + "multiplication", + "times", + "x" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", @@ -11187,7 +11405,7 @@ ], "synonyms": [], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -11664,10 +11882,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2228.000244140625, - "y": 875.0000610351563, - "width": 122.0, - "height": 244.99993896484376 + "x": -2124.999755859375, + "y": 883.0, + "width": 121.999755859375, + "height": 245.0 } }, "m_Slots": [ @@ -11826,10 +12044,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1992.0001220703125, - "y": 864.0000610351563, + "x": -1888.9998779296875, + "y": 871.9998779296875, "width": 208.0, - "height": 301.99993896484377 + "height": 302.0 } }, "m_Slots": [ @@ -11950,6 +12168,52 @@ "m_Channel": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SplitNode", + "m_ObjectId": "ef131bcab11e4a408881c9899334fe1b", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Split", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -969.0, + "y": 296.0, + "width": 120.0001220703125, + "height": 149.0 + } + }, + "m_Slots": [ + { + "m_Id": "52ee95c9cca940efa5f0796c129a45a0" + }, + { + "m_Id": "0a1988da0f2140fe8ee44aa8c7cc4f80" + }, + { + "m_Id": "59e2af6d9a894fe49bffa238473abfb8" + }, + { + "m_Id": "06ab797e4c1148bd93aff5d69b79aef2" + }, + { + "m_Id": "43882cc4a1054cf09b733d419324e616" + } + ], + "synonyms": [ + "separate" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", @@ -12252,10 +12516,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1945.0001220703125, - "y": 1205.0001220703125, + "x": -1841.9998779296875, + "y": 1212.9998779296875, "width": 208.0, - "height": 313.0 + "height": 313.0001220703125 } }, "m_Slots": [ diff --git a/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_ParticleShader.shader b/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_ParticleShader.shader index 56c082eb..7f67cc87 100644 --- a/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_ParticleShader.shader +++ b/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_ParticleShader.shader @@ -54,6 +54,7 @@ Shader "PopcornFX/URP/ParticleShader" #pragma shader_feature _ PK_HAS_DIFFUSE_RAMP #pragma shader_feature _ PK_HAS_SOFT #pragma shader_feature _ PK_HAS_LIGHTING PK_HAS_DISTORTION + #pragma shader_feature _ PK_HAS_ATLAS #pragma shader_feature _ PK_HAS_ANIM_BLEND PK_HAS_RIBBON_COMPLEX //------------------------------------------------------------------------------------ // Unity defined keywords diff --git a/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_ParticleShader_CutOutOpaque.shader b/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_ParticleShader_CutOutOpaque.shader index 32169b7c..39e916aa 100644 --- a/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_ParticleShader_CutOutOpaque.shader +++ b/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_ParticleShader_CutOutOpaque.shader @@ -50,6 +50,7 @@ Shader "PopcornFX/URP/ParticleShader_CutOutOpaque" #pragma shader_feature _ PK_HAS_TRANSFORM_UVS #pragma shader_feature _ PK_HAS_DIFFUSE_RAMP #pragma shader_feature _ PK_HAS_LIGHTING + #pragma shader_feature _ PK_HAS_ATLAS #pragma shader_feature _ PK_HAS_ANIM_BLEND PK_HAS_RIBBON_COMPLEX //------------------------------------------------------------------------------------ diff --git a/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Particle_LitOpaque.shadergraph b/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Particle_LitOpaque.shadergraph index 9c375916..b4bc9d9b 100644 --- a/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Particle_LitOpaque.shadergraph +++ b/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Particle_LitOpaque.shadergraph @@ -52,6 +52,9 @@ }, { "m_Id": "302498b5cea34c649792f9b4ef616dd1" + }, + { + "m_Id": "0528a269cc6c4030815beadf4bdca76a" } ], "m_Dropdowns": [], @@ -1938,6 +1941,30 @@ "m_DefaultType": 0 } +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.ShaderKeyword", + "m_ObjectId": "0528a269cc6c4030815beadf4bdca76a", + "m_Guid": { + "m_GuidSerialized": "f311aff4-8008-49ee-94d6-25c40623e43d" + }, + "m_Name": "PK_HAS_ATLAS", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "PK_HAS_ATLAS", + "m_DefaultReferenceName": "_PK_HAS_ATLAS", + "m_OverrideReferenceName": "PK_HAS_ATLAS_ON", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_KeywordType": 0, + "m_KeywordDefinition": 0, + "m_KeywordScope": 0, + "m_KeywordStages": 63, + "m_Entries": [], + "m_Value": 0, + "m_IsEditable": true +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot", @@ -6140,6 +6167,9 @@ { "m_Id": "49be4ef2c7b14814aa94ea8eb14e610f" }, + { + "m_Id": "0528a269cc6c4030815beadf4bdca76a" + }, { "m_Id": "387b7f4f81794ad893b8cff24556ccae" }, diff --git a/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Particle_LitTransparent.shadergraph b/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Particle_LitTransparent.shadergraph index 7ff9dce6..1e1d9e89 100644 --- a/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Particle_LitTransparent.shadergraph +++ b/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Particle_LitTransparent.shadergraph @@ -52,6 +52,9 @@ }, { "m_Id": "e9de60eb6bce49658a3692554cea37cb" + }, + { + "m_Id": "a27d9d70b94d4918945b3ef457e108fc" } ], "m_Dropdowns": [], @@ -5917,6 +5920,9 @@ { "m_Id": "49be4ef2c7b14814aa94ea8eb14e610f" }, + { + "m_Id": "a27d9d70b94d4918945b3ef457e108fc" + }, { "m_Id": "387b7f4f81794ad893b8cff24556ccae" }, @@ -8157,6 +8163,30 @@ "m_Labels": [] } +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.ShaderKeyword", + "m_ObjectId": "a27d9d70b94d4918945b3ef457e108fc", + "m_Guid": { + "m_GuidSerialized": "74535b70-9fc3-49a8-856c-0299e407dad3" + }, + "m_Name": "PK_HAS_ATLAS", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "PK_HAS_ATLAS", + "m_DefaultReferenceName": "_PK_HAS_ATLAS", + "m_OverrideReferenceName": "PK_HAS_ATLAS_ON", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_KeywordType": 0, + "m_KeywordDefinition": 0, + "m_KeywordScope": 0, + "m_KeywordStages": 63, + "m_Entries": [], + "m_Value": 0, + "m_IsEditable": true +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", diff --git a/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Particle_UnlitOpaque.shadergraph b/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Particle_UnlitOpaque.shadergraph index 1f2d576c..04185448 100644 --- a/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Particle_UnlitOpaque.shadergraph +++ b/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Particle_UnlitOpaque.shadergraph @@ -43,6 +43,9 @@ }, { "m_Id": "681dc1eb0e824b69905239a294d040e4" + }, + { + "m_Id": "679ca3cf6f134f64b7fc40123bf4932c" } ], "m_Dropdowns": [], @@ -3293,6 +3296,30 @@ "m_BareResource": false } +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.ShaderKeyword", + "m_ObjectId": "679ca3cf6f134f64b7fc40123bf4932c", + "m_Guid": { + "m_GuidSerialized": "1e60bcfe-8ac7-4880-800b-855ab0fe1323" + }, + "m_Name": "PK_HAS_ATLAS", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "PK_HAS_ATLAS", + "m_DefaultReferenceName": "_PK_HAS_ATLAS", + "m_OverrideReferenceName": "PK_HAS_ATLAS_ON", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_KeywordType": 0, + "m_KeywordDefinition": 0, + "m_KeywordScope": 0, + "m_KeywordStages": 63, + "m_Entries": [], + "m_Value": 0, + "m_IsEditable": true +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", @@ -4395,6 +4422,9 @@ { "m_Id": "49be4ef2c7b14814aa94ea8eb14e610f" }, + { + "m_Id": "679ca3cf6f134f64b7fc40123bf4932c" + }, { "m_Id": "387b7f4f81794ad893b8cff24556ccae" }, diff --git a/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Particle_UnlitTransparent.shadergraph b/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Particle_UnlitTransparent.shadergraph index 43830bd6..8c55f1e6 100644 --- a/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Particle_UnlitTransparent.shadergraph +++ b/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Particle_UnlitTransparent.shadergraph @@ -43,6 +43,9 @@ }, { "m_Id": "61e9109302354915957febc7b03dc746" + }, + { + "m_Id": "9977c2e27de94ce38ab373a48200c0b1" } ], "m_Dropdowns": [], @@ -2440,6 +2443,9 @@ }, { "m_Id": "61e9109302354915957febc7b03dc746" + }, + { + "m_Id": "9977c2e27de94ce38ab373a48200c0b1" } ] } @@ -3788,8 +3794,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -3017.0, - "y": -233.00003051757813, + "x": -2770.0, + "y": -256.0000305175781, "width": 255.0, "height": 238.0 } @@ -6252,6 +6258,30 @@ } } +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.ShaderKeyword", + "m_ObjectId": "9977c2e27de94ce38ab373a48200c0b1", + "m_Guid": { + "m_GuidSerialized": "329d50b4-be3e-4be3-b2ef-7f19db4d3565" + }, + "m_Name": "PK_HAS_ATLAS", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "PK_HAS_ATLAS", + "m_DefaultReferenceName": "_PK_HAS_ATLAS", + "m_OverrideReferenceName": "PK_HAS_ATLAS_ON", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_KeywordType": 0, + "m_KeywordDefinition": 0, + "m_KeywordScope": 0, + "m_KeywordStages": 63, + "m_Entries": [], + "m_Value": 0, + "m_IsEditable": true +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", diff --git a/com.persistant-studios.popcornfx.urp/package.json b/com.persistant-studios.popcornfx.urp/package.json index 54c08f3b..e2ff6646 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.19.5", + "version": "2.19.6", "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.5" + "com.persistant-studios.popcornfx": "2.19.6" } } diff --git a/com.persistant-studios.popcornfx/Documentation~/popcornfx.md b/com.persistant-studios.popcornfx/Documentation~/popcornfx.md index 6c26863a..bc3a0e10 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.19.5` +* **Version:** `v2.19.6` * **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/Editor/Scripts/PKFxFXEditor.cs b/com.persistant-studios.popcornfx/Editor/Scripts/PKFxFXEditor.cs index 4edd8309..670d03e2 100644 --- a/com.persistant-studios.popcornfx/Editor/Scripts/PKFxFXEditor.cs +++ b/com.persistant-studios.popcornfx/Editor/Scripts/PKFxFXEditor.cs @@ -188,6 +188,15 @@ private void DrawEmitterProperties() private void DrawEvents() { + PKFxEmitter fx = target as PKFxEmitter; + + //Asset as been updated by reimport. + if (fx.EffectAsset.m_EventDescsHash != fx.m_EventDescsHash) + { + fx.UpdateEffectAsset(fx.EffectAsset, false); + m_RequiresApplyModifiedProperties = true; + } + if (m_Events.arraySize == 0) return; diff --git a/com.persistant-studios.popcornfx/README.md b/com.persistant-studios.popcornfx/README.md index 1b44c30e..7403a279 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.19.5` +* **Version:** `v2.19.6` * **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/Materials/PKFxShaderCode/CustomFunctions/SwizzleVertexInputs.cginc b/com.persistant-studios.popcornfx/Runtime/Materials/PKFxShaderCode/CustomFunctions/SwizzleVertexInputs.cginc index 632b01d4..3429c1c2 100644 --- a/com.persistant-studios.popcornfx/Runtime/Materials/PKFxShaderCode/CustomFunctions/SwizzleVertexInputs.cginc +++ b/com.persistant-studios.popcornfx/Runtime/Materials/PKFxShaderCode/CustomFunctions/SwizzleVertexInputs.cginc @@ -38,7 +38,7 @@ void SwizzleVertexInputs_float( in float4 texCoord0, in float4 texCoord1, uv0 = vertexInputs[currentIdx].xy; uv1 = vertexInputs[currentIdx++].zw; int animBlendAlphaCursorIdx = currentIdx; - frameLerp = frac(vertexInputs[currentIdx++].x); + frameLerp = vertexInputs[currentIdx++].x; # if PK_HAS_ALPHA_REMAP_ON alphaCursor = vertexInputs[animBlendAlphaCursorIdx].y; @@ -59,9 +59,12 @@ void SwizzleVertexInputs_float( in float4 texCoord0, in float4 texCoord1, # endif # if PK_HAS_TRANSFORM_UVS_ON -#if !PK_HAS_RIBBON_COMPLEX_ON && !PK_HAS_ANIM_BLEND_ON - transformUvsRotate = vertexInputs[currentIdx++].x; -#endif - transformUvsScaleAndOffset = vertexInputs[currentIdx++]; +# if !PK_HAS_RIBBON_COMPLEX_ON && !PK_HAS_ANIM_BLEND_ON +# if PK_HAS_ATLAS_ON + frameLerp = vertexInputs[currentIdx].y; +# endif + transformUvsRotate = vertexInputs[currentIdx++].x; +# endif + transformUvsScaleAndOffset = vertexInputs[currentIdx++]; # endif } diff --git a/com.persistant-studios.popcornfx/Runtime/Materials/PKFxShaderCode/CustomFunctions/TransformUvs.cginc b/com.persistant-studios.popcornfx/Runtime/Materials/PKFxShaderCode/CustomFunctions/TransformUvs.cginc index 6ef9cce3..0eb44485 100644 --- a/com.persistant-studios.popcornfx/Runtime/Materials/PKFxShaderCode/CustomFunctions/TransformUvs.cginc +++ b/com.persistant-studios.popcornfx/Runtime/Materials/PKFxShaderCode/CustomFunctions/TransformUvs.cginc @@ -16,7 +16,7 @@ void TransformUVs_float(in float2 uv, in float2 uv1, in float frameLerp, in floa uv1Out = uv1; dUVdx = float2(0.0f, 0.0f); dUVdy = float2(0.0f, 0.0f); - frameLerpOut = frameLerp; + frameLerpOut = frac(frameLerp); oldUV0 = uv; oldUV1 = uv1; @@ -27,19 +27,20 @@ void TransformUVs_float(in float2 uv, in float2 uv1, in float frameLerp, in floa float2 UVScale = scaleAndOffset.xy; float2 UVOffset = scaleAndOffset.zw; float4 rect0 = float4(1.0f, 1.0f, 0.0f, 0.0f); -# if PK_HAS_ANIM_BLEND_ON +# if PK_HAS_ATLAS_ON float idf = abs(frameLerp); uint maxAtlasIdx = _Atlas.Load(0) - 1; uint idA = min(uint(floor(idf)), maxAtlasIdx); rect0 = asfloat(_Atlas.Load4((idA + 1) * 4 * 4)); - uint idB = min(idA + 1U, maxAtlasIdx); - float4 rect1 = asfloat(_Atlas.Load4((idB + 1) * 4 * 4)); - uv1 = ((uv1 - rect1.zw) / rect1.xy); // normalize (if atlas) + # if PK_HAS_ANIM_BLEND_ON + uint idB = min(idA + 1U, maxAtlasIdx); + float4 rect1 = asfloat(_Atlas.Load4((idB + 1) * 4 * 4)); + uv1 = ((uv1 - rect1.zw) / rect1.xy); // normalize (if atlas) - uv1 = transformUV(uv1, UVScale, UVRotation, UVOffset); // scale then rotate then translate UV - uv1Out = frac(uv1) * rect1.xy + rect1.zw; // undo normalize - -# endif + uv1 = transformUV(uv1, UVScale, UVRotation, UVOffset); // scale then rotate then translate UV + uv1Out = frac(uv1) * rect1.xy + rect1.zw; // undo normalize + # endif +#endif uv = ((uv - rect0.zw) / rect0.xy); // normalize (if atlas) uv = transformUV(uv, UVScale, UVRotation, UVOffset); // scale then rotate then translate UV // For clean derivatives: diff --git a/com.persistant-studios.popcornfx/Runtime/Materials/PKFxShaderCode/FragmentShader.cginc b/com.persistant-studios.popcornfx/Runtime/Materials/PKFxShaderCode/FragmentShader.cginc index 03680c1b..668fd52f 100644 --- a/com.persistant-studios.popcornfx/Runtime/Materials/PKFxShaderCode/FragmentShader.cginc +++ b/com.persistant-studios.popcornfx/Runtime/Materials/PKFxShaderCode/FragmentShader.cginc @@ -36,18 +36,20 @@ float4 frag(SVertexOutput i) : SV_Target float2 UVScale = i.TransformUVs_ScaleAndOffset.xy; float2 UVOffset = i.TransformUVs_ScaleAndOffset.zw; float4 rect0 = float4(1.0f, 1.0f, 0.0f, 0.0f); - # if defined(PK_HAS_ANIM_BLEND) + + # if defined(PK_HAS_ATLAS) float idf = abs(i.FrameLerp); uint maxAtlasIdx = _Atlas.Load(0) - 1; uint idA = min(uint(floor(idf)), maxAtlasIdx); rect0 = asfloat(_Atlas.Load4((idA + 1) * 4 * 4)); - uint idB = min(idA + 1U, maxAtlasIdx); - float4 rect1 = asfloat(_Atlas.Load4((idB + 1) * 4 * 4)); - uv1 = ((uv1 - rect1.zw) / rect1.xy); // normalize (if atlas) - - uv1 = transformUV(uv1, UVScale, UVRotation, UVOffset); // scale then rotate then translate UV - uv1 = frac(uv1) * rect1.xy + rect1.zw; // undo normalize + # if defined(PK_HAS_ATLAS) + uint idB = min(idA + 1U, maxAtlasIdx); + float4 rect1 = asfloat(_Atlas.Load4((idB + 1) * 4 * 4)); + uv1 = ((uv1 - rect1.zw) / rect1.xy); // normalize (if atlas) + uv1 = transformUV(uv1, UVScale, UVRotation, UVOffset); // scale then rotate then translate UV + uv1 = frac(uv1) * rect1.xy + rect1.zw; // undo normalize + #endif # endif uv = ((uv - rect0.zw) / rect0.xy); // normalize (if atlas) uv = transformUV(uv, UVScale, UVRotation, UVOffset); // scale then rotate then translate UV @@ -178,6 +180,8 @@ float4 frag(SVertexOutput i) : SV_Target #if CUTOUT_OPAQUE return float4((result * depthfade).rgb, 1); +#elif PK_HAS_DISTORTION + return result; #else return result * depthfade; #endif diff --git a/com.persistant-studios.popcornfx/Runtime/Materials/PKFxShaderCode/VertexInput.cginc b/com.persistant-studios.popcornfx/Runtime/Materials/PKFxShaderCode/VertexInput.cginc index b6443851..f68cae6e 100644 --- a/com.persistant-studios.popcornfx/Runtime/Materials/PKFxShaderCode/VertexInput.cginc +++ b/com.persistant-studios.popcornfx/Runtime/Materials/PKFxShaderCode/VertexInput.cginc @@ -76,7 +76,11 @@ struct SVertexInput # if PK_HAS_TRANSFORM_UVS # if !PK_HAS_RIBBON_COMPLEX && !PK_HAS_ANIM_BLEND - float2 TransformUVs_Rotate : TRANSFORMUV0_TEXCOORD; // Only one float +# if PK_HAS_ATLAS + float2 TransformUVs_Rotate : TRANSFORMUV0_TEXCOORD; +# else + float TransformUVs_Rotate : TRANSFORMUV0_TEXCOORD; +# endif # endif float4 TransformUVs_ScaleAndOffset : TRANSFORMUV1_TEXCOORD; # endif diff --git a/com.persistant-studios.popcornfx/Runtime/Materials/PKFxShaderCode/VertexShader.cginc b/com.persistant-studios.popcornfx/Runtime/Materials/PKFxShaderCode/VertexShader.cginc index 848e9894..7432d69f 100644 --- a/com.persistant-studios.popcornfx/Runtime/Materials/PKFxShaderCode/VertexShader.cginc +++ b/com.persistant-studios.popcornfx/Runtime/Materials/PKFxShaderCode/VertexShader.cginc @@ -77,7 +77,7 @@ SVertexOutput vert(SVertexInput v) o.UV0 = v.UVs.xy; o.UV1 = v.UVs.zw; - o.FrameLerp = /*frac(*/v.AtlasIdAlphaCursorRotate.x;//); + o.FrameLerp = v.AtlasIdAlphaCursorRotate.x; #if PK_HAS_ALPHA_REMAP o.AlphaCursor = v.AtlasIdAlphaCursorRotate.y; @@ -103,6 +103,9 @@ SVertexOutput vert(SVertexInput v) o.TransformUVs_Rotate = v.AtlasIdAlphaCursorRotate.z; #else o.TransformUVs_Rotate = v.TransformUVs_Rotate; + #if PK_HAS_ATLAS + o.FrameLerp = v.AtlasIdAlphaCursorRotate.y; + #endif #endif o.TransformUVs_ScaleAndOffset = v.TransformUVs_ScaleAndOffset; #endif diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/ARM64.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/ARM64.meta index 6604ed30..a1d760ba 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: d3bdce648d784eff9f11492618bcdad6 +guid: ddffde7f9ae74519aea5866d18f1d59a folderAsset: yes DefaultImporter: diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/Android.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/Android.meta index 5326c7dc..3a7a3ae8 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: a4565904afc247ad8f9ff5f99f9f6113 +guid: d3161f0c82d44855a7ba60ce09f9fa55 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 4779f355..91b51f2c 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:529b77d0f1189bd0ecf01f811db7e6b01fd16a321b78a98c6af0f4af0236d334 -size 176653084 +oid sha256:422d7ca0a1deffb042f99c2a4540960efa676d5add596c7169e7951a6e704adf +size 177352140 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 1850ec18..80005dfa 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: 9f8b37ead62c4c8d829cb934fb05f69e +guid: ea4a8a2ef2ee40f08a8363f075c54488 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 23bd5270..75e07be6 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: 1581d764edf4420b914c42cc4e1808d9 +guid: e30342a6cab64c4a9ac0907303d182cf 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 69c22f53..c545a618 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:13d6673b69b86b6bb792b84348439575b7e52ef539bd22718c13a4a27a5c7d4d -size 138224208 +oid sha256:6f1b78c683c843a8019818f53b91f3b3d59070868146a0be29b39f681b81877a +size 139333920 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 c6e39f18..04ba901c 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: eb7a2d15292847118c0dc2d97359582b +guid: 4160d5efbb794bc7ba553474b4b22343 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 34070003..d34fd3cd 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: f5da74843f0c44578cf3693fc4beb2dc +guid: 33bb7039aa6c4c51a813f6921c1e18e5 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 ca1f4351..aceeaa83 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:ec2ff210f97ad62c91d418acb6c622eb55c6ed94b7f31db0efdf4383fdea795b -size 69130209 +oid sha256:ae2b4c45fe4f9caddaaf3e1376e8a68fa6e0795418aef783015e95afa2ee22e4 +size 69130417 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 4021eeae..d5563e8e 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: bfaace6a25db43219deeded4a6e80e2e +guid: 61dcd3c4a59948ac81a2c972908b518c 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 4f28000f..dc70e305 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: 7aec7b95d5cd4f279e2903c1922e679b +guid: 8d101c6a343846c2901ff2bbd19c0e20 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 e62bbc32..fb3d6101 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: efc1ed2471694b92a2c7cc73c41f90d3 +guid: 16b63916300540249bcdfccebc929082 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 6b2ae427..8dc546fa 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:0f9ac34f8882753d3bfd0a0cb518cbadc8a608dc92e70284e635f4abce639530 -size 185034488 +oid sha256:d6b6b990f7846fdb248289c54d3a08c56917117408fc596fb802beddaddf429e +size 185040584 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 f5b8ea99..f39dd615 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: 92c4a6219dcd4ad28248905c1c9f928d +guid: 88b557e3a4e04398b754c9abc953e26f 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 221339e5..0e26d116 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: 7fc8780a0d7c4caf967ee5d596bcc895 +guid: 856c139342704c9a86f9cf06deff007a 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 bfe05f2a..d9d343e1 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:85c2f5730334f0a026b27e2f491ae4e0da88942501bd2d233e71d5c5ad398cf9 -size 4832768 +oid sha256:4dcf81fffa7b292449c77adccb3142a32239f4776e2119a52ca9e5205afc4c25 +size 4840960 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 078fc6e4..5a2d456d 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: b93d5b6563864792af0b9cf833285536 +guid: 49ff871ad47c4501a1c8a801634ceadd 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 4f4e81e9..40c7a38f 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: decb3830c0e048ee9fb68393af289ba8 +guid: 971de38098434f6eb8cb0f038bc3c997 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 78668a4f..47098e03 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:ad31834a44c2568e3f1acbba82c4f1c013a7ba81863fa9093e8ca523a69636de -size 24190464 +oid sha256:885449ea1825021f847cd81aa60c01048db810f61ccecb8ac0f4ea1aeb064732 +size 24192512 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 d67d76d6..37fb7896 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: 6d02ca6ea7884cc1be99a354f3732f76 +guid: 4428e96320264420ab039ac773a1894d 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 355e06cb..a6eeb3c7 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:d8074137f73cbeed5ca17108edfb156e6a802a3b4aefc52af8c3a4ec68fd28f5 -size 21855176 +oid sha256:9a4a8ddacf78abaa2c07415c0fa3b17351dfc6f849bf1f1d61a57bb1edd49d15 +size 21859272 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 141786d1..65d0ce56 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: dae2bc3221a8409d9f511b160ccf627c +guid: 0678ac987209428d97f8e31c923600ea PluginImporter: serializedVersion: 2 isPreloaded: 0 diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxManagedToNative.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxManagedToNative.cs index 847532ca..794d3c83 100644 --- a/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxManagedToNative.cs +++ b/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxManagedToNative.cs @@ -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.5 for " + m_UnityVersion; + public const string m_PluginVersion = "2.19.6 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/Runtime/Scripts/Internal/PKFxNativeToManaged.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxNativeToManaged.cs index 60047dfb..6d4e4ac7 100644 --- a/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxNativeToManaged.cs +++ b/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxNativeToManaged.cs @@ -553,14 +553,21 @@ private static void OnEffectDependencyFound(IntPtr dependencyPath, int useInfoFl depDesc.m_UsageFlags = useInfoFlags; bool isMeshRenderer = (useInfoFlags & (int)EUseInfoFlag.IsMeshRenderer) != 0; - if (isMeshRenderer && Path.GetExtension(depDesc.m_Path).CompareTo(".pkmm") == 0) - depDesc.m_Path = Path.ChangeExtension(depDesc.m_Path, ".fbx"); + bool isMeshSampler = (useInfoFlags & (int)EUseInfoFlag.IsMeshSampler) != 0; + + if (isMeshRenderer) + { + if (Path.GetExtension(depDesc.m_Path).CompareTo(".pkmm") == 0) + depDesc.m_Path = Path.ChangeExtension(depDesc.m_Path, ".fbx"); + } else depDesc.m_UsageFlags &= ~(int)EUseInfoFlag.IsMeshRenderer; - bool isMeshSampler = (useInfoFlags & (int)EUseInfoFlag.IsMeshSampler) != 0; - if (isMeshSampler && Path.GetExtension(depDesc.m_Path).ToLower().CompareTo(".fbx") == 0) - depDesc.m_Path = Path.ChangeExtension(depDesc.m_Path, ".pkmm"); + if (isMeshSampler) + { + if (Path.GetExtension(depDesc.m_Path).ToLower().CompareTo(".fbx") == 0) + depDesc.m_Path = Path.ChangeExtension(depDesc.m_Path, ".pkmm"); + } else depDesc.m_UsageFlags &= ~(int)EUseInfoFlag.IsMeshSampler; @@ -1076,43 +1083,43 @@ private static bool ResizeParticleMeshBuffer(Mesh mesh, VertexAttribute additionalUVIdx = 0; List layout = new List(); - layout.Add(new VertexAttributeDescriptor(VertexAttribute.Position, VertexAttributeFormat.Float32, 3)); // positions + layout.Add(new VertexAttributeDescriptor(VertexAttribute.Position, VertexAttributeFormat.Float32, 3)); // positions if (renderer.HasShaderVariationFlag(EShaderVariationFlags.Has_Lighting)) { - layout.Add(new VertexAttributeDescriptor(VertexAttribute.Normal, VertexAttributeFormat.Float32, 3)); // normal - layout.Add(new VertexAttributeDescriptor(VertexAttribute.Tangent, VertexAttributeFormat.Float32, 4)); // tangent + layout.Add(new VertexAttributeDescriptor(VertexAttribute.Normal, VertexAttributeFormat.Float32, 3)); // normal + layout.Add(new VertexAttributeDescriptor(VertexAttribute.Tangent, VertexAttributeFormat.Float32, 4)); // tangent } if (renderer.HasShaderVariationFlag(EShaderVariationFlags.Has_Color)) { - layout.Add(new VertexAttributeDescriptor(VertexAttribute.Color, VertexAttributeFormat.Float32, 4)); // color + layout.Add(new VertexAttributeDescriptor(VertexAttribute.Color, VertexAttributeFormat.Float32, 4)); // color } if (renderer.HasShaderVariationFlag(EShaderVariationFlags.Has_RibbonComplex)) { if (renderer.HasShaderVariationFlag(EShaderVariationFlags.Has_AlphaRemap) && renderer.HasShaderVariationFlag(EShaderVariationFlags.Has_TransformUVs)) { - layout.Add(new VertexAttributeDescriptor(VertexAttribute.TexCoord0, VertexAttributeFormat.Float32, 4)); // uvFactors + alpha cursor + rotate uv + layout.Add(new VertexAttributeDescriptor(VertexAttribute.TexCoord0, VertexAttributeFormat.Float32, 4)); // uvFactors + alpha cursor + transform uv rotate } else if (renderer.HasShaderVariationFlag(EShaderVariationFlags.Has_AlphaRemap) || renderer.HasShaderVariationFlag(EShaderVariationFlags.Has_TransformUVs)) { - layout.Add(new VertexAttributeDescriptor(VertexAttribute.TexCoord0, VertexAttributeFormat.Float32, 3)); // uvFactors + alpha cursor | rotate uvs + layout.Add(new VertexAttributeDescriptor(VertexAttribute.TexCoord0, VertexAttributeFormat.Float32, 3)); // uvFactors + alpha cursor | transform uv rotate } else { - layout.Add(new VertexAttributeDescriptor(VertexAttribute.TexCoord0, VertexAttributeFormat.Float32, 2)); // uvFactors + layout.Add(new VertexAttributeDescriptor(VertexAttribute.TexCoord0, VertexAttributeFormat.Float32, 2)); // uvFactors } - layout.Add(new VertexAttributeDescriptor(VertexAttribute.TexCoord1, VertexAttributeFormat.Float32, 2)); // uvScale/uvOffset + layout.Add(new VertexAttributeDescriptor(VertexAttribute.TexCoord1, VertexAttributeFormat.Float32, 4)); // uvScale/uvOffset additionalUVIdx = VertexAttribute.TexCoord2; } else if (renderer.HasShaderVariationFlag(EShaderVariationFlags.Has_AnimBlend)) { - layout.Add(new VertexAttributeDescriptor(VertexAttribute.TexCoord0, VertexAttributeFormat.Float32, 4)); // uv0/uv1 + layout.Add(new VertexAttributeDescriptor(VertexAttribute.TexCoord0, VertexAttributeFormat.Float32, 4)); // uv0/uv1 if (renderer.HasShaderVariationFlag(EShaderVariationFlags.Has_TransformUVs)) - layout.Add(new VertexAttributeDescriptor(VertexAttribute.TexCoord1, VertexAttributeFormat.Float32, 3)); // atlas id and if Has_AlphaRemap, alpha cursor and transform uv rotate + layout.Add(new VertexAttributeDescriptor(VertexAttribute.TexCoord1, VertexAttributeFormat.Float32, 3)); // atlas id and if Has_AlphaRemap, alpha cursor and transform uv rotate else - layout.Add(new VertexAttributeDescriptor(VertexAttribute.TexCoord1, VertexAttributeFormat.Float32, 2)); // atlas id and if Has_AlphaRemap, alpha cursor + layout.Add(new VertexAttributeDescriptor(VertexAttribute.TexCoord1, VertexAttributeFormat.Float32, 2)); // atlas id and if Has_AlphaRemap, alpha cursor additionalUVIdx = VertexAttribute.TexCoord2; } else @@ -1122,11 +1129,11 @@ private static bool ResizeParticleMeshBuffer(Mesh mesh, { if (renderer.HasShaderVariationFlag(EShaderVariationFlags.Has_AlphaRemap)) { - layout.Add(new VertexAttributeDescriptor(VertexAttribute.TexCoord0, VertexAttributeFormat.Float32, 3)); // uv0 + alpha cursor + layout.Add(new VertexAttributeDescriptor(VertexAttribute.TexCoord0, VertexAttributeFormat.Float32, 3)); // uv0 + alpha cursor } else { - layout.Add(new VertexAttributeDescriptor(VertexAttribute.TexCoord0, VertexAttributeFormat.Float32, 2)); // uv0 + layout.Add(new VertexAttributeDescriptor(VertexAttribute.TexCoord0, VertexAttributeFormat.Float32, 2)); // uv0 } additionalUVIdx = VertexAttribute.TexCoord1; } @@ -1134,7 +1141,7 @@ private static bool ResizeParticleMeshBuffer(Mesh mesh, if (renderer.HasShaderVariationFlag(EShaderVariationFlags.Has_Emissive)) { - layout.Add(new VertexAttributeDescriptor(additionalUVIdx, VertexAttributeFormat.Float32, 3)); // emissive color + layout.Add(new VertexAttributeDescriptor(additionalUVIdx, VertexAttributeFormat.Float32, 3)); // emissive color additionalUVIdx = additionalUVIdx + 1; } if (renderer.HasShaderVariationFlag(EShaderVariationFlags.Has_TransformUVs)) @@ -1142,10 +1149,13 @@ private static bool ResizeParticleMeshBuffer(Mesh mesh, if (!renderer.HasShaderVariationFlag(EShaderVariationFlags.Has_RibbonComplex) && !renderer.HasShaderVariationFlag(EShaderVariationFlags.Has_AnimBlend)) { - layout.Add(new VertexAttributeDescriptor(additionalUVIdx, VertexAttributeFormat.Float32, 2)); // TransformUVs rotate + if (renderer.HasShaderVariationFlag(EShaderVariationFlags.Has_Atlas)) + layout.Add(new VertexAttributeDescriptor(additionalUVIdx, VertexAttributeFormat.Float32, 2)); // TransformUVs rotate + AtlasID + else + layout.Add(new VertexAttributeDescriptor(additionalUVIdx, VertexAttributeFormat.Float32, 1)); // TransformUVs rotate additionalUVIdx = additionalUVIdx + 1; } - layout.Add(new VertexAttributeDescriptor(additionalUVIdx, VertexAttributeFormat.Float32, 4)); // TransformUVs ScaleAndOffset + layout.Add(new VertexAttributeDescriptor(additionalUVIdx, VertexAttributeFormat.Float32, 4)); // TransformUVs ScaleAndOffset additionalUVIdx = additionalUVIdx + 1; } diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxEffectAsset.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxEffectAsset.cs index ed4a1352..d119792f 100644 --- a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxEffectAsset.cs +++ b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxEffectAsset.cs @@ -525,6 +525,7 @@ public override void Clean() m_EventDescs = new List(); m_AttributeDescsHash = 0; m_SamplerDescsHash = 0; + m_EventDescsHash = 0; m_RendererDescsHash = 0; m_RequiresGameThreadCollect = false; } diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxSettings.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxSettings.cs index aa2a2169..ffc7f09c 100644 --- a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxSettings.cs +++ b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxSettings.cs @@ -55,11 +55,8 @@ public static PKFxSettings Instance [SerializeField] private bool m_QualityCategory = true; [SerializeField] private bool m_EnableRaycastForCollisions = false; - -#if UNITY_EDITOR - [SerializeField] private bool m_EnableAssetPlatformVersion = false; - [SerializeField] private BuildTarget m_CurrentPlatform = BuildTarget.NoTarget; -#endif + [SerializeField] private bool m_UpdateSimManually = false; + [SerializeField] private bool m_UseApplicationAudioLoopback = false; [SerializeField] public string[] m_PopcornLayerName = new string[5]; @@ -91,6 +88,12 @@ public static bool UpdateSimManually set { Instance.m_UpdateSimManually = value; } } + public static bool UseApplicationAudioLoopback + { + get { return Instance.m_UseApplicationAudioLoopback; } + set { Instance.m_UseApplicationAudioLoopback = value; } + } + public void GetRenderingLayerForBatchDesc(SBatchDesc batchDesc, out int layer) { Debug.Assert((batchDesc.m_CameraId >= 0 && batchDesc.m_CameraId < m_PopcornLayerName.Length), "[PKFX] Wrong camera ID feeded to materials factory"); @@ -102,30 +105,6 @@ public void GetRenderingLayerForBatchDesc(SBatchDesc batchDesc, out int layer) layer = -1; } -#if UNITY_EDITOR - public static bool EnableAssetPlatformVersion - { - get { return Instance.m_EnableAssetPlatformVersion; } - set { Instance.m_EnableAssetPlatformVersion = value; } - } - - public static string CurrentPlatformName - { - get - { - if (Instance.m_CurrentPlatform == BuildTarget.NoTarget) - return "Editor"; - return Instance.m_CurrentPlatform.ToString(); - } - } - - public static BuildTarget CurrentPlatform - { - get { return Instance.m_CurrentPlatform; } - set { Instance.m_CurrentPlatform = value; } - } -#endif - public int GetCameraLayer(int index) { if (ManualCameraLayer) @@ -188,7 +167,6 @@ public class SParticleMeshDefaultSize [SerializeField] private PKFxMaterialFactory m_MaterialFactory = null; [SerializeField] private bool m_EnableSoftParticles = true; [SerializeField] private bool m_DisableDynamicEffectBounds = false; - [SerializeField] private bool m_UseApplicationAudioLoopback = false; [SerializeField] private bool m_EnableThumbnails = true; [SerializeField] private bool m_UseThumbnailsInBuilds = false; @@ -205,7 +183,6 @@ public class SParticleMeshDefaultSize [SerializeField] private bool m_ManualCameraLayer = false; [SerializeField] private int m_MaxCameraSupport = 1; - [SerializeField] private bool m_UpdateSimManually = false; [SerializeField] private bool m_EnablePopcornFXLight = false; [SerializeField] private int m_MaxPopcornFXLights = 16; @@ -245,12 +222,6 @@ public static uint FrameCountBeforeFreeingUnusedBatches set { Instance.m_FrameCountBeforeFreeingUnusedBatches = value; } } - public static bool UseApplicationAudioLoopback - { - get { return Instance.m_UseApplicationAudioLoopback; } - set { Instance.m_UseApplicationAudioLoopback = value; } - } - public static bool EnableThumbnails { get { return Instance.m_EnableThumbnails; } @@ -604,6 +575,11 @@ public static bool EnableFileLogs [SerializeField] private string m_PopcornPackFxPath = null; [SerializeField] private string m_UnityPackFxPath = "/PopcornFXAssets"; +#if UNITY_EDITOR + [SerializeField] private bool m_EnableAssetPlatformVersion = false; + [SerializeField] private BuildTarget m_CurrentPlatform = BuildTarget.NoTarget; +#endif + public static bool BakingCategory { get { return Instance.m_BakingCategory; } @@ -685,6 +661,30 @@ public static bool UseHashesAsMaterialName set { Instance.m_UseHashesAsMaterialName = value; } } +#if UNITY_EDITOR + public static bool EnableAssetPlatformVersion + { + get { return Instance.m_EnableAssetPlatformVersion; } + set { Instance.m_EnableAssetPlatformVersion = value; } + } + + public static string CurrentPlatformName + { + get + { + if (Instance.m_CurrentPlatform == BuildTarget.NoTarget) + return "Editor"; + return Instance.m_CurrentPlatform.ToString(); + } + } + + public static BuildTarget CurrentPlatform + { + get { return Instance.m_CurrentPlatform; } + set { Instance.m_CurrentPlatform = value; } + } +#endif + #if UNITY_EDITOR public static bool GetProjetAssetPath() diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxShaderInputBindings.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxShaderInputBindings.cs index c62f8e57..f9e3e7f2 100644 --- a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxShaderInputBindings.cs +++ b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxShaderInputBindings.cs @@ -489,9 +489,13 @@ public void SetMaterialKeywords(SBatchDesc batchDesc, Material material) { _EnableMaterialKeywords(material, "PK_HAS_RIBBON_COMPLEX"); } - else if (batchDesc.HasShaderVariationFlag(EShaderVariationFlags.Has_AnimBlend)) + else if (batchDesc.HasShaderVariationFlag(EShaderVariationFlags.Has_Atlas)) { - _EnableMaterialKeywords(material, "PK_HAS_ANIM_BLEND"); + _EnableMaterialKeywords(material, "PK_HAS_ATLAS"); + if (batchDesc.HasShaderVariationFlag(EShaderVariationFlags.Has_AnimBlend)) + { + _EnableMaterialKeywords(material, "PK_HAS_ANIM_BLEND"); + } } else { diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxRendererDescription.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxRendererDescription.cs index 91139e94..81f8add4 100644 --- a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxRendererDescription.cs +++ b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxRendererDescription.cs @@ -764,7 +764,7 @@ public class SMeshDesc private ComputeBuffer m_AtlasInfo = null; public IntPtr GetNativeRawAtlasesBuffer() { return m_AtlasInfo == null ? IntPtr.Zero : m_AtlasInfo.GetNativeBufferPtr(); } - public int NativeRawAtlasesBufferSize { get { return m_AtlasInfo == null ? 0 : 4112; } } /*257 * 16*/ + public int NativeRawAtlasesBufferSize { get { return m_AtlasInfo == null ? 0 : 8208; } } /*513 * 16*/ public SMeshDesc(Material mat, SBatchDesc batchDesc, GameObject renderingObject) { @@ -816,7 +816,7 @@ public void Init() Clean(); if (HasShaderVariationFlag(EShaderVariationFlags.Has_Atlas) && HasShaderVariationFlag(EShaderVariationFlags.Has_TransformUVs)) - m_AtlasInfo = new ComputeBuffer(257, 16, ComputeBufferType.Raw); + m_AtlasInfo = new ComputeBuffer(513, 16, ComputeBufferType.Raw); m_Material.SetBuffer("_Atlas", m_AtlasInfo); diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxTextureUtils.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxTextureUtils.cs index 6549462f..d0252498 100644 --- a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxTextureUtils.cs +++ b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxTextureUtils.cs @@ -10,27 +10,58 @@ namespace PopcornFX { - internal enum EImageFormat : int + internal enum EImageFormat : int // Duplicate of PopcornFX::CImage::EFormat enum { - Invalid = 0, - BGR8 = 3, - BGRA8, - BGRA8_sRGB, - DXT1 = 8, - DXT1_sRGB, - DXT3, - DXT3_sRGB, - DXT5, - DXT5_sRGB, - RGB8_ETC1 = 16, - RGB8_ETC2, - RGBA8_ETC2, - RGB8A1_ETC2, - RGB4_PVRTC1, - RGB2_PVRTC1, - RGBA4_PVRTC1, - RGBA2_PVRTC1, - Fp32_RGBA = 26 + Format_Invalid = 0, + + // Basic integer formats: + Format_Lum8, + Format_LumAlpha8, + Format_BGR8, + Format_BGRA8, + Format_BGRA8_sRGB, + + // Packed integer format: + Format_BGRA4, // 16bpp 4.4.4.4 BGRA Linear + Format_BGRA4_sRGB, // 16bpp 4.4.4.4 BGRA sRGB + + // 4 BC/DXT compressed formats: + Format_DXT1, + Format_DXT1_sRGB, + Format_DXT3, + Format_DXT3_sRGB, + Format_DXT5, + Format_DXT5_sRGB, + + Format_BC5_UNorm, + Format_BC5_SNorm, + + // Mobile-friendly compressed formats: + Format_RGB8_ETC1, + Format_RGB8_ETC2, + Format_RGBA8_ETC2, + Format_RGB8A1_ETC2, + + Format_RGB4_PVRTC1, + Format_RGB4_PVRTC1_sRGB, + Format_RGB2_PVRTC1, + Format_RGB2_PVRTC1_sRGB, + Format_RGBA4_PVRTC1, + Format_RGBA4_PVRTC1_sRGB, + Format_RGBA2_PVRTC1, + Format_RGBA2_PVRTC1_sRGB, + + // Fp32 versions of the basic formats: + Format_Fp32Lum, + Format_Fp32LumAlpha, + Format_Fp32RGBA, + + // Fp16 versions of the basic formats: + Format_Fp16Lum, + Format_Fp16LumAlpha, + Format_Fp16RGBA, + + __MaxImageFormats, } internal static class PKImageConverter @@ -75,48 +106,48 @@ internal static class PKFxTextureUtils internal static EImageFormat ResolveImageFormat(Texture2D t, ref NativeArray data) { if (t.format == TextureFormat.DXT1) - return EImageFormat.DXT1; + return EImageFormat.Format_DXT1; else if (t.format == TextureFormat.DXT5) - return EImageFormat.DXT5; + return EImageFormat.Format_DXT5; else if (t.format == TextureFormat.ARGB32) { PKImageConverter.ARGB2BGRA(ref data); - return EImageFormat.BGRA8; + return EImageFormat.Format_BGRA8; } else if (t.format == TextureFormat.RGBA32) { PKImageConverter.RGBA2BGRA(ref data); - return EImageFormat.BGRA8; + return EImageFormat.Format_BGRA8; } else if (t.format == TextureFormat.BGRA32) - return EImageFormat.BGRA8; + return EImageFormat.Format_BGRA8; else if (t.format == TextureFormat.RGB24) { PKImageConverter.RGB2BGR(ref data); - return EImageFormat.BGR8; + return EImageFormat.Format_BGR8; } else if (t.format == TextureFormat.PVRTC_RGB4) - return EImageFormat.RGB4_PVRTC1; + return EImageFormat.Format_RGB4_PVRTC1; else if (t.format == TextureFormat.PVRTC_RGBA4) - return EImageFormat.RGBA4_PVRTC1; + return EImageFormat.Format_RGBA4_PVRTC1; else if (t.format == TextureFormat.PVRTC_RGB2) - return EImageFormat.RGB2_PVRTC1; + return EImageFormat.Format_RGB2_PVRTC1; else if (t.format == TextureFormat.PVRTC_RGBA2) - return EImageFormat.RGBA2_PVRTC1; + return EImageFormat.Format_RGBA2_PVRTC1; else if (t.format == TextureFormat.ETC_RGB4) - return EImageFormat.RGB8_ETC1; + return EImageFormat.Format_RGB8_ETC1; else if (t.format == TextureFormat.ETC2_RGB) - return EImageFormat.RGB8_ETC2; + return EImageFormat.Format_RGB8_ETC2; else if (t.format == TextureFormat.ETC2_RGBA8) - return EImageFormat.RGBA8_ETC2; + return EImageFormat.Format_RGBA8_ETC2; else if (t.format == TextureFormat.ETC2_RGBA1) - return EImageFormat.RGB8A1_ETC2; + return EImageFormat.Format_RGB8A1_ETC2; else if (t.format == TextureFormat.RGBAFloat) - return EImageFormat.Fp32_RGBA; + return EImageFormat.Format_Fp32RGBA; else { Debug.LogError("[PopcornFX] " + t.name + " texture format not supported : " + t.format); - return EImageFormat.Invalid; + return EImageFormat.Format_Invalid; } } @@ -133,7 +164,7 @@ internal static IntPtr GetAndUpdateTextureToFill(Texture2D texture, Sampler.ETex STextureSamplerToFill* textureToFill = (STextureSamplerToFill*)textureToFillPtr.ToPointer(); if (textureToFill->m_TextureData == IntPtr.Zero || - imageFormat == EImageFormat.Invalid) + imageFormat == EImageFormat.Format_Invalid) return IntPtr.Zero; void* textureDataPtr = (void*)textureToFill->m_TextureData.ToPointer(); diff --git a/com.persistant-studios.popcornfx/package.json b/com.persistant-studios.popcornfx/package.json index d6f9fb70..d18730b7 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.19.5", + "version": "2.19.6", "unity": "2019.3", "displayName": "PopcornFX" } diff --git a/download_3rd_party.bat b/download_3rd_party.bat index 7831ec96..2ec28d40 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.19.5-21365_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.6-21661_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 3f9213bb..28cf9a89 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.19.5-21365_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.6-21661_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_android/PK-IntegrationUnity.make b/projects/UnityStore_android/PK-IntegrationUnity.make index ccdaa93b..03f9ba7b 100644 --- a/projects/UnityStore_android/PK-IntegrationUnity.make +++ b/projects/UnityStore_android/PK-IntegrationUnity.make @@ -51,7 +51,7 @@ DEFINES += -D_DEBUG -DZ_PREFIX -DZ_PREFIX_CUSTOM=pk_z_ -DPK_USE_RENDER_HELPERS=1 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ADDITIONAL_FLAGS) -march=armv7-a -mfloat-abi=softfp -Wshadow -Wundef -fno-omit-frame-pointer -fPIC -fno-strict-aliasing -g -fno-unsigned-char -Wall -Wextra -MP -pipe -Winvalid-pch -fno-math-errno -fno-trapping-math -ggdb -mfpu=neon ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) $(ADDITIONAL_FLAGS) -march=armv7-a -mfloat-abi=softfp -Wshadow -Wundef -fno-omit-frame-pointer -fPIC -fno-strict-aliasing -g -fno-unsigned-char -Wall -Wextra -std=gnu++0x -fvisibility-inlines-hidden -fno-rtti -fvisibility=hidden -Winvalid-pch -fno-math-errno -fno-trapping-math -ggdb -mfpu=neon LIBS += -lPK-RenderHelpers_d -lPK-Plugin_CompilerBackend_CPU_VM_d -lPK-ZLib_d -lPK-Plugin_CodecImage_PKM_d -lm -llog -lPK-ParticlesToolbox_d -lPK-Runtime_d -lEGL -lGLESv3 -ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_android -shared -Wl,--no-undefined -Wl,--build-id -shared +ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_android -shared -Wl,--no-undefined -Wl,--build-id -shared -static-libstdc++ else ifeq ($(config),debug_android64) ifeq ($(origin CC), default) @@ -70,7 +70,7 @@ DEFINES += -D_DEBUG -DZ_PREFIX -DZ_PREFIX_CUSTOM=pk_z_ -DPK_USE_RENDER_HELPERS=1 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ADDITIONAL_FLAGS64) -march=armv8-a -Wshadow -Wundef -fno-omit-frame-pointer -fPIC -fno-strict-aliasing -g -fno-unsigned-char -Wall -Wextra -MP -pipe -Winvalid-pch -fno-math-errno -fno-trapping-math -ggdb ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) $(ADDITIONAL_FLAGS64) -march=armv8-a -Wshadow -Wundef -fno-omit-frame-pointer -fPIC -fno-strict-aliasing -g -fno-unsigned-char -Wall -Wextra -std=gnu++0x -fvisibility-inlines-hidden -fno-rtti -fvisibility=hidden -Winvalid-pch -fno-math-errno -fno-trapping-math -ggdb LIBS += -lPK-RenderHelpers_d -lPK-Plugin_CompilerBackend_CPU_VM_d -lPK-ZLib_d -lPK-Plugin_CodecImage_PKM_d -lm -llog -lPK-ParticlesToolbox_d -lPK-Runtime_d -lEGL -lGLESv3 -ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 -shared -Wl,--no-undefined -Wl,--build-id -shared +ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 -shared -Wl,--no-undefined -Wl,--build-id -shared -static-libstdc++ else ifeq ($(config),release_android) ifeq ($(origin CC), default) @@ -89,7 +89,7 @@ DEFINES += -DNDEBUG -DZ_PREFIX -DZ_PREFIX_CUSTOM=pk_z_ -DPK_USE_RENDER_HELPERS=1 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ADDITIONAL_FLAGS) -march=armv7-a -mfloat-abi=softfp -Wshadow -Wundef -fno-omit-frame-pointer -O3 -fPIC -fno-strict-aliasing -g -fno-unsigned-char -Wall -Wextra -MP -pipe -Winvalid-pch -fno-math-errno -fno-trapping-math -mfpu=neon ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) $(ADDITIONAL_FLAGS) -march=armv7-a -mfloat-abi=softfp -Wshadow -Wundef -fno-omit-frame-pointer -O3 -fPIC -fno-strict-aliasing -g -fno-unsigned-char -Wall -Wextra -std=gnu++0x -fvisibility-inlines-hidden -fno-rtti -fvisibility=hidden -Winvalid-pch -fno-math-errno -fno-trapping-math -mfpu=neon LIBS += -lPK-RenderHelpers_r -lPK-Plugin_CompilerBackend_CPU_VM_r -lPK-ZLib_r -lPK-Plugin_CodecImage_PKM_r -lm -llog -lPK-ParticlesToolbox_r -lPK-Runtime_r -lEGL -lGLESv3 -ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_android -shared -Wl,--no-undefined -Wl,--build-id -shared +ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_android -shared -Wl,--no-undefined -Wl,--build-id -shared -static-libstdc++ else ifeq ($(config),release_android64) ifeq ($(origin CC), default) @@ -108,7 +108,7 @@ DEFINES += -DNDEBUG -DZ_PREFIX -DZ_PREFIX_CUSTOM=pk_z_ -DPK_USE_RENDER_HELPERS=1 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ADDITIONAL_FLAGS64) -march=armv8-a -Wshadow -Wundef -fno-omit-frame-pointer -O3 -fPIC -fno-strict-aliasing -g -fno-unsigned-char -Wall -Wextra -MP -pipe -Winvalid-pch -fno-math-errno -fno-trapping-math ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) $(ADDITIONAL_FLAGS64) -march=armv8-a -Wshadow -Wundef -fno-omit-frame-pointer -O3 -fPIC -fno-strict-aliasing -g -fno-unsigned-char -Wall -Wextra -std=gnu++0x -fvisibility-inlines-hidden -fno-rtti -fvisibility=hidden -Winvalid-pch -fno-math-errno -fno-trapping-math LIBS += -lPK-RenderHelpers_r -lPK-Plugin_CompilerBackend_CPU_VM_r -lPK-ZLib_r -lPK-Plugin_CodecImage_PKM_r -lm -llog -lPK-ParticlesToolbox_r -lPK-Runtime_r -lEGL -lGLESv3 -ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 -shared -Wl,--no-undefined -Wl,--build-id -shared +ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 -shared -Wl,--no-undefined -Wl,--build-id -shared -static-libstdc++ #else # $(error "invalid configuration $(config)")