diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index 2971190cdb1..67989fe654e 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -377,6 +377,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed lens flare not rendering correctly with TAAU or DLSS. - Fixed case where the SceneView don't refresh when using LightExplorer with a running and Paused game (1354129) - Fixed wrong ordering in FrameSettings (Normalize Reflection Probes) +- Fixed ThreadMapDetail to saturate AO & smoothness strength inputs to prevent out-of-bounds values set by users (1357740) - Allow negative wind speed parameter. ### Changed diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/CottonWool.shadergraph b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/CottonWool.shadergraph index eaef33b6743..a1aee2a67ce 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/CottonWool.shadergraph +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/CottonWool.shadergraph @@ -1,5 +1,5 @@ { - "m_SGVersion": 2, + "m_SGVersion": 3, "m_Type": "UnityEditor.ShaderGraph.GraphData", "m_ObjectId": "ce817203cf2f49deb0e8a0e7906e540a", "m_Properties": [ @@ -65,6 +65,12 @@ } ], "m_Keywords": [], + "m_Dropdowns": [], + "m_CategoryData": [ + { + "m_Id": "194f433c869e4a7c8d18b944bcd377eb" + } + ], "m_Nodes": [ { "m_Id": "a30d806aeb7442ef90a1c55ac396158d" @@ -969,10 +975,12 @@ "serializedMesh": { "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", "m_Guid": "" - } + }, + "preventRotation": false }, "m_Path": "HDRP/Fabric", - "m_ConcretePrecision": 0, + "m_GraphPrecision": 0, + "m_PreviewMode": 2, "m_OutputNode": { "m_Id": "" }, @@ -1002,8 +1010,16 @@ "m_SupportLodCrossFade": false, "m_DoubleSidedMode": 0, "m_DOTSInstancing": false, + "m_CustomVelocity": false, + "m_Tessellation": false, + "m_TessellationMode": 0, + "m_TessellationFactorMinDistance": 20.0, + "m_TessellationFactorMaxDistance": 50.0, + "m_TessellationFactorTriangleSize": 100.0, + "m_TessellationShapeFactor": 0.75, + "m_TessellationBackFaceCullEpsilon": -0.25, + "m_TessellationMaxDisplacement": 0.009999999776482582, "m_Version": 0, - "m_FirstTimeMigrationExecuted": false, "inspectorFoldoutMask": 0 } @@ -1014,10 +1030,10 @@ "m_Id": 0, "m_DisplayName": "Fuzz Map", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -1027,10 +1043,10 @@ "m_Id": 1, "m_DisplayName": "Texture", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Texture", "m_StageCapability": 3, + "m_BareResource": false, "m_Texture": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" @@ -1045,7 +1061,6 @@ "m_Id": 0, "m_DisplayName": "Normal", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Normal", "m_StageCapability": 1, @@ -1089,6 +1104,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1104,7 +1120,6 @@ "m_Id": 0, "m_DisplayName": "Base UV Mask", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1130,7 +1145,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -1149,18 +1163,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "122033f1a8ce4b64818792c11eb12a18", "m_Guid": { "m_GuidSerialized": "20e6cb1b-65c8-48b6-a376-0c8f32173b2b" }, "m_Name": "Smoothness Max", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_9114DBE7", "m_OverrideReferenceName": "_SmoothnessMax", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 1.0, "m_FloatType": 1, @@ -1177,7 +1196,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -1226,7 +1244,6 @@ "m_Id": 0, "m_DisplayName": "Thread UV Scale Transform", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1277,24 +1294,30 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "161cc5794e934d5394d6ceda9f487e6a", "m_Guid": { "m_GuidSerialized": "f8a95274-456d-419f-82b1-e52bb3f612aa" }, "m_Name": "Fuzz Strength", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_D620EF89", "m_OverrideReferenceName": "_FuzzStrength", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 1.0, "m_FloatType": 1, @@ -1311,7 +1334,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -1353,6 +1375,75 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "194f433c869e4a7c8d18b944bcd377eb", + "m_Name": "", + "m_ChildObjectList": [ + { + "m_Id": "53defc4e1cc84dd4aa5821c89a00ebba" + }, + { + "m_Id": "8f36eebfd6044e9ca9b6c3af4cb85d4b" + }, + { + "m_Id": "b913c909284e42c69b25c22a5afeeea7" + }, + { + "m_Id": "de6481523c854147bf8875348269ab9d" + }, + { + "m_Id": "3bc7938d8f7e4a6e96b164434158c6fe" + }, + { + "m_Id": "8b8ec79dc2c84c399cc68e2e9a166d2f" + }, + { + "m_Id": "122033f1a8ce4b64818792c11eb12a18" + }, + { + "m_Id": "eda4287078aa4eeab18123c92af18c38" + }, + { + "m_Id": "ebb8a00747ee4526883203ce0f67e4d2" + }, + { + "m_Id": "f53c87cf9be543ac94bef807bb27d7d9" + }, + { + "m_Id": "e186668b62194e1bb56ca6583f3c6d05" + }, + { + "m_Id": "453f5d72d7964869b1ef2bb166a27f9c" + }, + { + "m_Id": "e8e87a55b75b483bab7dddfb91cb579e" + }, + { + "m_Id": "4eb87c51b5ee4a9bb59be3c5d8a64a63" + }, + { + "m_Id": "1ae40d83102e49a38f87de214fe67251" + }, + { + "m_Id": "d53004b3d1de427892c6b4305ecc5f4e" + }, + { + "m_Id": "438898c6355f45649907d3528df133ab" + }, + { + "m_Id": "c2b02b000d9f49c5a76f119fa54eb852" + }, + { + "m_Id": "25d90b77900a4dcb8587f0c051f3774c" + }, + { + "m_Id": "161cc5794e934d5394d6ceda9f487e6a" + } + ] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.GroupData", @@ -1365,18 +1456,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "1ae40d83102e49a38f87de214fe67251", "m_Guid": { "m_GuidSerialized": "82f9de41-76a1-430f-b16c-4a1f51d25ca3" }, "m_Name": "Thread AO Strength", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_9106E3BE", "m_OverrideReferenceName": "_ThreadAOStrength01", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.5, "m_FloatType": 1, @@ -1393,7 +1489,6 @@ "m_Id": 5, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 2, @@ -1430,6 +1525,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1443,7 +1539,6 @@ "m_Id": 0, "m_DisplayName": "RGBA", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "RGBA", "m_StageCapability": 2, @@ -1469,7 +1564,6 @@ "m_Id": 3, "m_DisplayName": "Ambient Occlusion", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "AmbientOcclusion", "m_StageCapability": 2, @@ -1485,10 +1579,10 @@ "m_Id": 1, "m_DisplayName": "Texture", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Texture", "m_StageCapability": 3, + "m_BareResource": false, "m_Texture": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" @@ -1503,7 +1597,6 @@ "m_Id": 5, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 2, @@ -1532,7 +1625,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1581,7 +1673,6 @@ "m_Id": 4, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -1599,7 +1690,6 @@ "m_Id": 7, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 2, @@ -1611,18 +1701,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "25d90b77900a4dcb8587f0c051f3774c", "m_Guid": { "m_GuidSerialized": "a80c79f0-8441-45c7-b463-153e6543acc0" }, "m_Name": "Fuzz Map UV scale", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_D2266F29", "m_OverrideReferenceName": "_FuzzMapUVScale", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.10000000149011612, "m_FloatType": 0, @@ -1650,7 +1745,6 @@ "m_Id": 2, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -1695,6 +1789,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1708,7 +1803,6 @@ "m_Id": 211825253, "m_DisplayName": "Alpha", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_Alpha", "m_StageCapability": 2, @@ -1724,10 +1818,10 @@ "m_Id": 1, "m_DisplayName": "Texture", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Texture", "m_StageCapability": 3, + "m_BareResource": false, "m_Texture": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" @@ -1742,7 +1836,6 @@ "m_Id": 1, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 3, @@ -1779,6 +1872,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1794,7 +1888,7 @@ "m_Group": { "m_Id": "2111a9a336ce494eb26c0b79a8a353ea" }, - "m_Name": "UV Combine", + "m_Name": "UVCombine", "m_DrawState": { "m_Expanded": true, "m_Position": { @@ -1807,18 +1901,19 @@ }, "m_Slots": [ { - "m_Id": "4fab0ae0addb48418f9e66f5c2150efe" + "m_Id": "9a2dd6017bd54b7a9b89281506dd3407" }, { - "m_Id": "8d91ae62c6ab48c8adccf050f7f200ca" + "m_Id": "4fab0ae0addb48418f9e66f5c2150efe" }, { - "m_Id": "9a2dd6017bd54b7a9b89281506dd3407" + "m_Id": "8d91ae62c6ab48c8adccf050f7f200ca" } ], "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1830,7 +1925,9 @@ "m_PropertyIds": [ -1533382448, -1319696916 - ] + ], + "m_Dropdowns": [], + "m_DropdownSelectedEntries": [] } { @@ -1840,7 +1937,6 @@ "m_Id": 0, "m_DisplayName": "Specular Color", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1877,7 +1973,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -1926,7 +2021,6 @@ "m_Id": 7, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 2, @@ -1944,7 +2038,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -1988,6 +2081,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2028,6 +2122,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -2080,11 +2175,13 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, "m_TextureType": 0, - "m_NormalMapSpace": 0 + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true } { @@ -2095,16 +2192,23 @@ "m_GuidSerialized": "15bb43f0-03a1-4450-a37c-6842998d4b12" }, "m_Name": "Mask Map _(R) AO(G) _(B) S(A)", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Texture2D_FCEF774B", "m_OverrideReferenceName": "_MaskMap", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" }, + "isMainTexture": false, + "useTilingAndOffset": false, "m_Modifiable": true, "m_DefaultType": 0 } @@ -2116,7 +2220,6 @@ "m_Id": 0, "m_DisplayName": "Use Thread Map", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2131,7 +2234,6 @@ "m_Id": 0, "m_DisplayName": "Fuzz Strength", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2149,7 +2251,7 @@ "m_Group": { "m_Id": "5f4bba1e4db24265aa727f4f17c17d83" }, - "m_Name": "Thread Map Detail", + "m_Name": "ThreadMapDetail", "m_DrawState": { "m_Expanded": true, "m_Position": { @@ -2161,6 +2263,9 @@ } }, "m_Slots": [ + { + "m_Id": "fd23384d62374c0fb426ece108990f2e" + }, { "m_Id": "ada81cdd8704436ab054a79eefe49386" }, @@ -2199,14 +2304,12 @@ }, { "m_Id": "fd2eb988d0974ab3828267bb0c3ce1c8" - }, - { - "m_Id": "fd23384d62374c0fb426ece108990f2e" } ], "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2234,7 +2337,9 @@ 1831767174, -2037099335, 42933449 - ] + ], + "m_Dropdowns": [], + "m_DropdownSelectedEntries": [] } { @@ -2263,6 +2368,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2272,18 +2378,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "438898c6355f45649907d3528df133ab", "m_Guid": { "m_GuidSerialized": "d0b0dba5-2222-4e57-a4bb-63be15c90197" }, "m_Name": "Thread Smoothness Scale", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "", "m_OverrideReferenceName": "_ThreadSmoothnessScale", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.5, "m_FloatType": 1, @@ -2301,16 +2412,23 @@ "m_GuidSerialized": "7ed7227f-2a2c-4d93-9ca4-8f6beb19b4a1" }, "m_Name": "Thread Map", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "", "m_OverrideReferenceName": "_ThreadMap", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"texture\":{\"fileID\":2800000,\"guid\":\"cd19c89d4b2f99f439cb28098be331dc\",\"type\":3}}", "m_Guid": "" }, + "isMainTexture": false, + "useTilingAndOffset": false, "m_Modifiable": true, "m_DefaultType": 2 } @@ -2333,7 +2451,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -2358,7 +2475,6 @@ "m_Id": 1, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2383,7 +2499,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -2427,6 +2542,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2461,6 +2577,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2495,6 +2612,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2502,18 +2620,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector4ShaderProperty", "m_ObjectId": "4eb87c51b5ee4a9bb59be3c5d8a64a63", "m_Guid": { "m_GuidSerialized": "5a824074-5495-4232-8c15-1dc84b351162" }, "m_Name": "Thread UV Scale Transform", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "", "m_OverrideReferenceName": "_uvThreadST", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "x": 1.0, @@ -2530,7 +2653,6 @@ "m_Id": -1533382448, "m_DisplayName": "UV Channel Mask", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_uvMask", "m_StageCapability": 3, @@ -2556,7 +2678,6 @@ "m_Id": -1319696916, "m_DisplayName": "UV Tile and Offset", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_uvST", "m_StageCapability": 3, @@ -2622,11 +2743,13 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, "m_TextureType": 0, - "m_NormalMapSpace": 0 + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true } { @@ -2655,6 +2778,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2687,6 +2811,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2706,6 +2831,7 @@ "m_TransparentWritesMotionVec": false, "m_AlphaToMask": false, "m_DepthOffset": false, + "m_ConservativeDepthOffset": false, "m_TransparencyFog": true, "m_AlphaTestShadow": false, "m_BackThenFrontRendering": false, @@ -2761,11 +2887,13 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, "m_TextureType": 0, - "m_NormalMapSpace": 0 + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true } { @@ -2775,7 +2903,6 @@ "m_Id": 0, "m_DisplayName": "Thread Smoothness Scale", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2793,7 +2920,6 @@ "m_Id": 3, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2812,18 +2938,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector4ShaderProperty", "m_ObjectId": "53defc4e1cc84dd4aa5821c89a00ebba", "m_Guid": { "m_GuidSerialized": "590a33bb-fb27-404c-a77e-8d1efad175ba" }, "m_Name": "Base UV Mask", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "", "m_OverrideReferenceName": "_uvBaseMask", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "x": 1.0, @@ -2871,6 +3002,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -2883,7 +3015,6 @@ "m_Id": 0, "m_DisplayName": "Base Color", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2909,7 +3040,6 @@ "m_Id": -1319696916, "m_DisplayName": "UV Tile and Offset", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_uvST", "m_StageCapability": 3, @@ -2935,7 +3065,6 @@ "m_Id": 3, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -2953,7 +3082,6 @@ "m_Id": -2037099335, "m_DisplayName": "Thread Normal Strength", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_ThreadNormalStrength", "m_StageCapability": 2, @@ -2969,7 +3097,6 @@ "m_Id": 2, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -3020,6 +3147,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -3032,7 +3160,6 @@ "m_Id": 1, "m_DisplayName": "Normal", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Normal", "m_StageCapability": 2, @@ -3056,7 +3183,6 @@ "m_Id": 0, "m_DisplayName": "Emission", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Emission", "m_StageCapability": 2, @@ -3087,7 +3213,6 @@ "m_Id": 1, "m_DisplayName": "Strength", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Strength", "m_StageCapability": 3, @@ -3116,7 +3241,6 @@ "m_Id": 42933449, "m_DisplayName": "Thread Smoothness Strength", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_ThreadSmoothnessStrength", "m_StageCapability": 2, @@ -3136,6 +3260,7 @@ "m_TransparentWritesMotionVec": false, "m_AlphaToMask": false, "m_DepthOffset": false, + "m_ConservativeDepthOffset": false, "m_TransparencyFog": true, "m_AlphaTestShadow": false, "m_BackThenFrontRendering": false, @@ -3151,10 +3276,10 @@ "m_Id": 0, "m_DisplayName": "Base Color Map", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -3164,7 +3289,6 @@ "m_Id": 4, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 2, @@ -3201,6 +3325,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3216,7 +3341,6 @@ "m_Id": 1831767174, "m_DisplayName": "Thread AO Strength", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_ThreadAOStrength", "m_StageCapability": 2, @@ -3232,7 +3356,6 @@ "m_Id": 0, "m_DisplayName": "Base UV Scale Transform", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3277,6 +3400,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3292,7 +3416,6 @@ "m_Id": 0, "m_DisplayName": "Base Color", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "BaseColor", "m_StageCapability": 2, @@ -3342,6 +3465,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3355,7 +3479,6 @@ "m_Id": 2, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 3, @@ -3373,7 +3496,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -3420,6 +3542,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3435,7 +3558,6 @@ "m_Id": 0, "m_DisplayName": "Thread UV Mask", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3480,6 +3602,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3495,7 +3618,6 @@ "m_Id": 4, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 2, @@ -3513,7 +3635,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -3576,7 +3697,6 @@ "m_Id": 1211659516, "m_DisplayName": "Normals", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_Normals", "m_StageCapability": 2, @@ -3600,7 +3720,6 @@ "m_Id": 0, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3625,7 +3744,6 @@ "m_Id": 0, "m_DisplayName": "Thickness", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Thickness", "m_StageCapability": 2, @@ -3655,7 +3773,6 @@ "m_Id": 0, "m_DisplayName": "RGBA", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "RGBA", "m_StageCapability": 2, @@ -3681,7 +3798,6 @@ "m_Id": 0, "m_DisplayName": "Bent Normal", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "BentNormal", "m_StageCapability": 2, @@ -3725,6 +3841,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3740,7 +3857,6 @@ "m_Id": 234905224, "m_DisplayName": "Smoothness", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_Smoothness", "m_StageCapability": 2, @@ -3775,6 +3891,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3790,7 +3907,6 @@ "m_Id": 0, "m_DisplayName": "Tangent", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Tangent", "m_StageCapability": 1, @@ -3815,10 +3931,10 @@ "m_Id": 0, "m_DisplayName": "Normal Map", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -3851,7 +3967,8 @@ "m_Id": "00e99dd273634ec9b10f23bfa33b0193" } ], - "m_CustomEditorGUI": "" + "m_CustomEditorGUI": "", + "m_SupportVFX": false } { @@ -3861,7 +3978,6 @@ "m_Id": 4, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 2, @@ -3879,7 +3995,6 @@ "m_Id": 1, "m_DisplayName": "X", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "X", "m_StageCapability": 3, @@ -3897,7 +4012,6 @@ "m_Id": 3, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3916,18 +4030,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "8b8ec79dc2c84c399cc68e2e9a166d2f", "m_Guid": { "m_GuidSerialized": "6241710c-4975-4571-8fa6-46028d76ae6f" }, "m_Name": "Smoothness Min", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_137577A6", "m_OverrideReferenceName": "_SmoothnessMin", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.0, "m_FloatType": 1, @@ -3963,6 +4082,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3976,7 +4096,6 @@ "m_Id": 1, "m_DisplayName": "UV", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -4020,24 +4139,30 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector4ShaderProperty", "m_ObjectId": "8f36eebfd6044e9ca9b6c3af4cb85d4b", "m_Guid": { "m_GuidSerialized": "091eb6ce-7f90-4578-b7dc-656f785f6aa3" }, "m_Name": "Base UV Scale Transform", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "", "m_OverrideReferenceName": "_uvBaseST", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "x": 1.0, @@ -4054,7 +4179,6 @@ "m_Id": 0, "m_DisplayName": "RGBA", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "RGBA", "m_StageCapability": 2, @@ -4080,7 +4204,6 @@ "m_Id": 6, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 2, @@ -4098,7 +4221,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -4147,7 +4269,6 @@ "m_Id": 0, "m_DisplayName": "Normal Map Strength", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -4165,7 +4286,6 @@ "m_Id": 2, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -4191,7 +4311,6 @@ "m_Id": 1, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -4216,7 +4335,6 @@ "m_Id": 0, "m_DisplayName": "Alpha", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Alpha", "m_StageCapability": 2, @@ -4232,7 +4350,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -4257,7 +4374,6 @@ "m_Id": -1533382448, "m_DisplayName": "UV Channel Mask", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_uvMask", "m_StageCapability": 3, @@ -4283,7 +4399,6 @@ "m_Id": 2, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -4309,7 +4424,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -4353,6 +4467,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -4368,7 +4483,6 @@ "m_Id": 5, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 2, @@ -4386,7 +4500,6 @@ "m_Id": 2, "m_DisplayName": "T", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "T", "m_StageCapability": 3, @@ -4430,6 +4543,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -4470,6 +4584,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -4482,7 +4597,6 @@ "m_Id": 0, "m_DisplayName": "Normal (Tangent Space)", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "NormalTS", "m_StageCapability": 2, @@ -4507,10 +4621,10 @@ "m_Id": 3, "m_DisplayName": "Sampler", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Sampler", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -4520,7 +4634,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -4598,6 +4711,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -4611,10 +4725,10 @@ "m_Id": -182820338, "m_DisplayName": "ThreadMap", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_ThreadMap", "m_StageCapability": 2, + "m_BareResource": false, "m_Texture": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" @@ -4648,6 +4762,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -4661,7 +4776,6 @@ "m_Id": 0, "m_DisplayName": "Specular Color", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Specular", "m_StageCapability": 2, @@ -4711,6 +4825,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -4726,10 +4841,10 @@ "m_Id": 3, "m_DisplayName": "Sampler", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Sampler", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -4767,6 +4882,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -4780,16 +4896,23 @@ "m_GuidSerialized": "59a67fb1-9bc9-44a2-bdf1-3020f0477029" }, "m_Name": "Base Color Map", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "", "m_OverrideReferenceName": "_BaseColorMap", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" }, + "isMainTexture": false, + "useTilingAndOffset": false, "m_Modifiable": true, "m_DefaultType": 0 } @@ -4801,7 +4924,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -4826,7 +4948,6 @@ "m_Id": 0, "m_DisplayName": "Thread AO Strength", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -4844,7 +4965,6 @@ "m_Id": 1, "m_DisplayName": "In Min Max", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "InMinMax", "m_StageCapability": 3, @@ -4888,6 +5008,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -4903,7 +5024,6 @@ "m_Id": 2, "m_DisplayName": "Smoothness", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Smoothness", "m_StageCapability": 2, @@ -4920,16 +5040,23 @@ "m_GuidSerialized": "e40cc53d-76bf-4c64-b873-35605e3df332" }, "m_Name": "Fuzz Map", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Texture2D_CBF24C60", "m_OverrideReferenceName": "_FuzzMap", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" }, + "isMainTexture": false, + "useTilingAndOffset": false, "m_Modifiable": true, "m_DefaultType": 1 } @@ -4941,7 +5068,6 @@ "m_Id": 0, "m_DisplayName": "Subsurface Mask", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "SubsurfaceMask", "m_StageCapability": 2, @@ -4957,10 +5083,10 @@ "m_Id": 0, "m_DisplayName": "Thread Map", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -4970,7 +5096,6 @@ "m_Id": 0, "m_DisplayName": "Diffusion Profile", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "DiffusionProfileHash", "m_StageCapability": 2, @@ -4992,7 +5117,7 @@ "m_Group": { "m_Id": "d7ca40dc9c4c4decb3aee4622cb88552" }, - "m_Name": "UV Combine", + "m_Name": "UVCombine", "m_DrawState": { "m_Expanded": true, "m_Position": { @@ -5005,18 +5130,19 @@ }, "m_Slots": [ { - "m_Id": "5915f6ae181a4399b797b9e24c3c1ad7" + "m_Id": "4f2560ddd60c46e7bb92072a9d655860" }, { - "m_Id": "e02e1c20f1234df8b72a0cc7137a40bc" + "m_Id": "5915f6ae181a4399b797b9e24c3c1ad7" }, { - "m_Id": "4f2560ddd60c46e7bb92072a9d655860" + "m_Id": "e02e1c20f1234df8b72a0cc7137a40bc" } ], "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -5028,7 +5154,9 @@ "m_PropertyIds": [ -1533382448, -1319696916 - ] + ], + "m_Dropdowns": [], + "m_DropdownSelectedEntries": [] } { @@ -5038,7 +5166,6 @@ "m_Id": 2, "m_DisplayName": "Out Min Max", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "OutMinMax", "m_StageCapability": 3, @@ -5063,7 +5190,6 @@ "m_Id": 7, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 2, @@ -5081,7 +5207,6 @@ "m_Id": -1709975888, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_UV", "m_StageCapability": 2, @@ -5103,7 +5228,6 @@ "m_Id": 0, "m_DisplayName": "Thread Normal Strength", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -5140,6 +5264,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -5155,7 +5280,6 @@ "m_Id": 6, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 2, @@ -5173,7 +5297,6 @@ "m_Id": 1705060832, "m_DisplayName": "AmbientOcclusion", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_AmbientOcclusion", "m_StageCapability": 2, @@ -5189,7 +5312,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -5257,6 +5379,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -5294,6 +5417,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -5325,6 +5449,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -5338,10 +5463,10 @@ "m_Id": 3, "m_DisplayName": "Sampler", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Sampler", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -5351,7 +5476,6 @@ "m_Id": 6, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 2, @@ -5394,6 +5518,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -5429,6 +5554,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -5467,6 +5593,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -5479,7 +5606,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -5522,18 +5648,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "d53004b3d1de427892c6b4305ecc5f4e", "m_Guid": { "m_GuidSerialized": "9241d5b7-4111-4f70-984b-60e5019fae48" }, "m_Name": "Thread Normal Strength", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_F3D27F0A", "m_OverrideReferenceName": "_ThreadNormalStrength", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.5, "m_FloatType": 1, @@ -5550,7 +5681,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -5615,11 +5745,13 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, "m_TextureType": 1, - "m_NormalMapSpace": 0 + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true } { @@ -5640,7 +5772,6 @@ "m_Id": 0, "m_DisplayName": "RGBA", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "RGBA", "m_StageCapability": 2, @@ -5660,18 +5791,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 2, "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", "m_ObjectId": "de6481523c854147bf8875348269ab9d", "m_Guid": { "m_GuidSerialized": "7b882733-7502-4fe2-aafe-6dc24de49027" }, "m_Name": "Base Color", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "", "m_OverrideReferenceName": "_BaseColor", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "r": 0.729411780834198, @@ -5679,6 +5815,7 @@ "b": 0.729411780834198, "a": 0.0 }, + "isMainColor": false, "m_ColorMode": 0 } @@ -5708,6 +5845,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -5721,7 +5859,6 @@ "m_Id": 5, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 2, @@ -5739,7 +5876,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -5764,7 +5900,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -5792,7 +5927,6 @@ "m_Id": 1, "m_DisplayName": "UV", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -5815,11 +5949,16 @@ "m_GuidSerialized": "dd9abbb7-9633-411e-91d0-5ba041ed0dda" }, "m_Name": "Use Thread Map", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "", "m_OverrideReferenceName": "_useThreadMap", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": true } @@ -5843,8 +5982,16 @@ "m_SupportLodCrossFade": false, "m_DoubleSidedMode": 3, "m_DOTSInstancing": false, - "m_Version": 0, - "m_FirstTimeMigrationExecuted": true, + "m_CustomVelocity": false, + "m_Tessellation": false, + "m_TessellationMode": 0, + "m_TessellationFactorMinDistance": 20.0, + "m_TessellationFactorMaxDistance": 50.0, + "m_TessellationFactorTriangleSize": 100.0, + "m_TessellationShapeFactor": 0.75, + "m_TessellationBackFaceCullEpsilon": -0.25, + "m_TessellationMaxDisplacement": 0.009999999776482582, + "m_Version": 1, "inspectorFoldoutMask": 0 } @@ -5855,7 +6002,6 @@ "m_Id": 6, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 2, @@ -5873,7 +6019,6 @@ "m_Id": 7, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 2, @@ -5885,18 +6030,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector4ShaderProperty", "m_ObjectId": "e8e87a55b75b483bab7dddfb91cb579e", "m_Guid": { "m_GuidSerialized": "fa389c8d-1de4-4353-9a23-8b805cacb9c3" }, "m_Name": "Thread UV Mask", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "", "m_OverrideReferenceName": "_uvThreadMask", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "x": 1.0, @@ -5920,16 +6070,23 @@ "m_GuidSerialized": "eb361664-caaf-41a1-ad6f-fc9ef43c1320" }, "m_Name": "Normal Map", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "", "m_OverrideReferenceName": "_NormalMap", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" }, + "isMainTexture": false, + "useTilingAndOffset": false, "m_Modifiable": true, "m_DefaultType": 3 } @@ -5941,7 +6098,6 @@ "m_Id": 0, "m_DisplayName": "Fuzz Map UV scale", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -5959,7 +6115,6 @@ "m_Id": 0, "m_DisplayName": "Ambient Occlusion", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Occlusion", "m_StageCapability": 2, @@ -6003,6 +6158,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -6034,6 +6190,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -6041,18 +6198,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 2, "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", "m_ObjectId": "eda4287078aa4eeab18123c92af18c38", "m_Guid": { "m_GuidSerialized": "28adbd46-38a3-41f0-bcce-a40e1be0681d" }, "m_Name": "Specular Color", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Color_265C63FA", "m_OverrideReferenceName": "_SpecularColor", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "r": 0.20000000298023225, @@ -6060,6 +6222,7 @@ "b": 0.20000000298023225, "a": 0.0 }, + "isMainColor": false, "m_ColorMode": 0 } @@ -6070,10 +6233,10 @@ "m_Id": 0, "m_DisplayName": "Mask Map _(R) AO(G) _(B) S(A)", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -6083,7 +6246,6 @@ "m_Id": 2, "m_DisplayName": "Y", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Y", "m_StageCapability": 3, @@ -6120,6 +6282,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -6133,7 +6296,6 @@ "m_Id": 0, "m_DisplayName": "Position", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Position", "m_StageCapability": 1, @@ -6152,18 +6314,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "f53c87cf9be543ac94bef807bb27d7d9", "m_Guid": { "m_GuidSerialized": "a4bfd223-86d7-44f5-bf1f-20b3b0471610" }, "m_Name": "Normal Map Strength", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_B81BC5DC", "m_OverrideReferenceName": "_NormalMapStrength", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 1.0, "m_FloatType": 1, @@ -6180,10 +6347,10 @@ "m_Id": 3, "m_DisplayName": "Sampler", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Sampler", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -6193,7 +6360,6 @@ "m_Id": 0, "m_DisplayName": "Smoothness", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Smoothness", "m_StageCapability": 2, @@ -6209,7 +6375,6 @@ "m_Id": 4, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 2, @@ -6227,10 +6392,10 @@ "m_Id": 1, "m_DisplayName": "Texture", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Texture", "m_StageCapability": 3, + "m_BareResource": false, "m_Texture": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" @@ -6245,7 +6410,6 @@ "m_Id": 235535200, "m_DisplayName": "Use Thread Map", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_UseThreadMap", "m_StageCapability": 2, @@ -6260,7 +6424,6 @@ "m_Id": 4, "m_DisplayName": "Alpha", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Alpha", "m_StageCapability": 2, @@ -6276,7 +6439,6 @@ "m_Id": 0, "m_DisplayName": "Smoothness Min", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -6313,6 +6475,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -6345,6 +6508,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -6360,7 +6524,6 @@ "m_Id": 0, "m_DisplayName": "Smoothness Max", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/Subgraph/ThreadMapDetail.shadersubgraph b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/Subgraph/ThreadMapDetail.shadersubgraph index d93f23d67d7..c4f85bf0570 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/Subgraph/ThreadMapDetail.shadersubgraph +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/Subgraph/ThreadMapDetail.shadersubgraph @@ -1,5 +1,5 @@ { - "m_SGVersion": 2, + "m_SGVersion": 3, "m_Type": "UnityEditor.ShaderGraph.GraphData", "m_ObjectId": "65578d680ef541edb3cfa33ddccc4d96", "m_Properties": [ @@ -35,6 +35,12 @@ } ], "m_Keywords": [], + "m_Dropdowns": [], + "m_CategoryData": [ + { + "m_Id": "3b660f14f3b84803bdadc345e9225a0c" + } + ], "m_Nodes": [ { "m_Id": "487dae965da64ea38851394bac98ba3a" @@ -131,6 +137,12 @@ }, { "m_Id": "bfbb4fe1c5a2428ea2ccabb8297376e7" + }, + { + "m_Id": "c033d4389cf54046bf7a711bb51beb07" + }, + { + "m_Id": "de0d06640c6d43fcbe91127b77ce92e3" } ], "m_GroupDatas": [ @@ -172,9 +184,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "e57586dd10374a24bf68ee68d251a0af" + "m_Id": "de0d06640c6d43fcbe91127b77ce92e3" }, - "m_SlotId": 2 + "m_SlotId": 0 } }, { @@ -494,9 +506,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "25f8257d5a1645e991c837532a642f48" + "m_Id": "c033d4389cf54046bf7a711bb51beb07" }, - "m_SlotId": 2 + "m_SlotId": 0 } }, { @@ -583,6 +595,20 @@ "m_SlotId": 2 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "c033d4389cf54046bf7a711bb51beb07" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "25f8257d5a1645e991c837532a642f48" + }, + "m_SlotId": 2 + } + }, { "m_OutputSlot": { "m_Node": { @@ -625,6 +651,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "de0d06640c6d43fcbe91127b77ce92e3" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "e57586dd10374a24bf68ee68d251a0af" + }, + "m_SlotId": 2 + } + }, { "m_OutputSlot": { "m_Node": { @@ -672,10 +712,12 @@ "serializedMesh": { "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", "m_Guid": "" - } + }, + "preventRotation": false }, "m_Path": "Utility/High Definition Render Pipeline/Fabric", - "m_ConcretePrecision": 0, + "m_GraphPrecision": 0, + "m_PreviewMode": 2, "m_OutputNode": { "m_Id": "86bcf008f4934ed7a96b70a34f420629" }, @@ -689,7 +731,6 @@ "m_Id": 2, "m_DisplayName": "False", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "False", "m_StageCapability": 3, @@ -714,7 +755,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -761,6 +801,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -773,7 +814,6 @@ "m_Id": 7, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 2, @@ -791,7 +831,6 @@ "m_Id": 1, "m_DisplayName": "Normal", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Normal", "m_StageCapability": 2, @@ -812,6 +851,30 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "0d1a99acdbbd48e1a8500c722187ded9", + "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.PropertyNode", @@ -824,9 +887,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -458.0, - "y": 360.0, - "width": 215.0, + "x": -668.0, + "y": 364.0, + "width": 229.0, "height": 34.0 } }, @@ -838,6 +901,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -853,7 +917,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -878,7 +941,6 @@ "m_Id": 1, "m_DisplayName": "True", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "True", "m_StageCapability": 3, @@ -903,7 +965,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -928,7 +989,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -954,7 +1014,6 @@ "m_Id": 5, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 2, @@ -972,7 +1031,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1043,6 +1101,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1056,7 +1115,6 @@ "m_Id": 0, "m_DisplayName": "Smoothness", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1074,7 +1132,6 @@ "m_Id": 0, "m_DisplayName": "UV", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1100,16 +1157,23 @@ "m_GuidSerialized": "110f2c7b-3415-4e1f-b153-d0756fef216a" }, "m_Name": "ThreadMap", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Texture2D_4013167B", "m_OverrideReferenceName": "_ThreadMap", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" }, + "isMainTexture": false, + "useTilingAndOffset": false, "m_Modifiable": true, "m_DefaultType": 2 } @@ -1126,9 +1190,9 @@ "m_Expanded": false, "m_Position": { "serializedVersion": "2", - "x": -151.0, - "y": 559.0, - "width": 121.0, + "x": -66.0, + "y": 561.0, + "width": 126.0, "height": 118.0 } }, @@ -1149,6 +1213,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -1161,7 +1226,6 @@ "m_Id": 2, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -1187,7 +1251,6 @@ "m_Id": 1, "m_DisplayName": "Strength", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Strength", "m_StageCapability": 3, @@ -1224,6 +1287,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1239,7 +1303,6 @@ "m_Id": 0, "m_DisplayName": "Normals", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1267,7 +1330,6 @@ "m_Id": 1, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1317,6 +1379,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1330,7 +1393,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -1386,6 +1448,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -1417,6 +1480,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1432,7 +1496,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -1457,7 +1520,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -1476,18 +1538,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector2ShaderProperty", "m_ObjectId": "385d0ecc6bcf4bdbb09efd22de620f42", "m_Guid": { "m_GuidSerialized": "0cfe9596-beed-43cb-a7c1-28df7483f9ed" }, "m_Name": "UV", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector2_18BA5697", "m_OverrideReferenceName": "_UV", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "x": 1.0, @@ -1504,7 +1571,6 @@ "m_Id": 2, "m_DisplayName": "T", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "T", "m_StageCapability": 3, @@ -1533,6 +1599,45 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "3b660f14f3b84803bdadc345e9225a0c", + "m_Name": "", + "m_ChildObjectList": [ + { + "m_Id": "d9eb3340d6c6418989b4be944c61af31" + }, + { + "m_Id": "2312588c3c904cac9b599d16d8ed91d3" + }, + { + "m_Id": "385d0ecc6bcf4bdbb09efd22de620f42" + }, + { + "m_Id": "7e4daf60ec4f46009ba214691bfdee5b" + }, + { + "m_Id": "8ff38c629a0a408db9cb7db4cf4fa83a" + }, + { + "m_Id": "523c1af3d19d4e4a9818d69c311e0e3e" + }, + { + "m_Id": "90e7bc402411450eb4c585e2d52e7ae5" + }, + { + "m_Id": "4eef33670c92444f9b9b2537fa9620c1" + }, + { + "m_Id": "b5587cfc8ee94bf8aec4c4ae1e963732" + }, + { + "m_Id": "8c73e6e056a44794bf26b1f9ccc0f8a9" + } + ] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", @@ -1565,6 +1670,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -1577,7 +1683,6 @@ "m_Id": 0, "m_DisplayName": "Predicate", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Predicate", "m_StageCapability": 3, @@ -1592,7 +1697,6 @@ "m_Id": 0, "m_DisplayName": "Use Thread Map", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1607,7 +1711,6 @@ "m_Id": 3, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1637,9 +1740,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -149.0, - "y": 697.0, - "width": 162.0, + "x": -64.0, + "y": 699.0, + "width": 170.0, "height": 34.0 } }, @@ -1651,6 +1754,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1666,7 +1770,6 @@ "m_Id": 0, "m_DisplayName": "Thread Smoothness Strength", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1703,6 +1806,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1758,11 +1862,13 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, "m_TextureType": 0, - "m_NormalMapSpace": 0 + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true } { @@ -1772,7 +1878,6 @@ "m_Id": 0, "m_DisplayName": "Thread AO Strength", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1790,7 +1895,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -1815,7 +1919,6 @@ "m_Id": 3, "m_DisplayName": "Ambient Occlusion", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "AmbientOcclusion", "m_StageCapability": 2, @@ -1833,7 +1936,6 @@ "m_Id": 3, "m_DisplayName": "Z", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Z", "m_StageCapability": 3, @@ -1845,18 +1947,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "4eef33670c92444f9b9b2537fa9620c1", "m_Guid": { "m_GuidSerialized": "d935cf22-0a1b-43f1-b1fa-be9764d04755" }, "m_Name": "Thread AO Strength", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_2870F26B", "m_OverrideReferenceName": "_ThreadAOStrength", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.5, "m_FloatType": 1, @@ -1873,7 +1980,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -1892,18 +1998,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "523c1af3d19d4e4a9818d69c311e0e3e", "m_Guid": { "m_GuidSerialized": "fc9b7ab9-d83b-4887-a555-28692897d85b" }, "m_Name": "Alpha", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_61CD5374", "m_OverrideReferenceName": "_Alpha", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 1.0, "m_FloatType": 0, @@ -1939,6 +2050,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1954,7 +2066,6 @@ "m_Id": 0, "m_DisplayName": "Thread Normal Strength", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1972,7 +2083,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -2000,7 +2110,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -2021,6 +2130,30 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "5ffc0b3bc6b64a2b83a785101fb32c19", + "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.NormalizeNode", @@ -2050,6 +2183,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -2062,7 +2196,6 @@ "m_Id": 2, "m_DisplayName": "Y", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Y", "m_StageCapability": 3, @@ -2080,7 +2213,6 @@ "m_Id": 2, "m_DisplayName": "T", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "T", "m_StageCapability": 3, @@ -2105,10 +2237,10 @@ "m_Id": 3, "m_DisplayName": "Sampler", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Sampler", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -2118,7 +2250,6 @@ "m_Id": 0, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2146,7 +2277,6 @@ "m_Id": 3, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2171,7 +2301,6 @@ "m_Id": 0, "m_DisplayName": "AmbientOcclusion", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2189,7 +2318,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -2214,7 +2342,6 @@ "m_Id": 4, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 2, @@ -2237,9 +2364,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 24.0, - "y": 565.0, - "width": 122.0, + "x": 109.0, + "y": 567.0, + "width": 126.0, "height": 118.0 } }, @@ -2257,6 +2384,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -2288,6 +2416,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2303,7 +2432,6 @@ "m_Id": 0, "m_DisplayName": "Normals", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2325,18 +2453,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector3ShaderProperty", "m_ObjectId": "7e4daf60ec4f46009ba214691bfdee5b", "m_Guid": { "m_GuidSerialized": "fa1b3334-3023-478f-8d87-82bcdec6ab47" }, "m_Name": "Normals", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector3_AFFB47E5", "m_OverrideReferenceName": "_Normals", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "x": 0.5, @@ -2353,7 +2486,6 @@ "m_Id": 3, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2378,7 +2510,6 @@ "m_Id": 1, "m_DisplayName": "True", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "True", "m_StageCapability": 3, @@ -2425,6 +2556,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -2437,7 +2569,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -2490,6 +2621,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -2507,9 +2639,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 103.0, - "y": 507.0, - "width": 149.0, + "x": 188.0, + "y": 509.0, + "width": 164.0, "height": 34.0 } }, @@ -2521,6 +2653,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2536,7 +2669,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2561,7 +2693,6 @@ "m_Id": 0, "m_DisplayName": "Alpha", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2584,9 +2715,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -361.0, - "y": 623.0, - "width": 171.0, + "x": -469.0, + "y": 615.0, + "width": 180.0, "height": 34.0 } }, @@ -2598,6 +2729,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2641,6 +2773,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2654,7 +2787,6 @@ "m_Id": 3, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2679,7 +2811,6 @@ "m_Id": 2, "m_DisplayName": "Smoothness", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Smoothness", "m_StageCapability": 2, @@ -2691,18 +2822,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "8c73e6e056a44794bf26b1f9ccc0f8a9", "m_Guid": { "m_GuidSerialized": "24ff54bf-3f70-4881-aded-191bd20052f7" }, "m_Name": "Thread Smoothness Strength", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_D5B952A7", "m_OverrideReferenceName": "_ThreadSmoothnessStrength", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.5, "m_FloatType": 1, @@ -2725,9 +2861,9 @@ "m_Position": { "serializedVersion": "2", "x": -439.0, - "y": 248.0, - "width": 124.0, - "height": 94.0 + "y": 212.0, + "width": 128.0, + "height": 93.0 } }, "m_Slots": [ @@ -2747,24 +2883,30 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "8ff38c629a0a408db9cb7db4cf4fa83a", "m_Guid": { "m_GuidSerialized": "f4d01d77-ecd0-43d5-9ed6-16cf78e4612a" }, "m_Name": "Smoothness", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_34701477", "m_OverrideReferenceName": "_Smoothness", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.5, "m_FloatType": 0, @@ -2781,7 +2923,6 @@ "m_Id": 1, "m_DisplayName": "True", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "True", "m_StageCapability": 3, @@ -2800,18 +2941,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "90e7bc402411450eb4c585e2d52e7ae5", "m_Guid": { "m_GuidSerialized": "d2df6573-0f7e-4c62-b020-b8e4bbdae1f1" }, "m_Name": "AmbientOcclusion", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_BF2B2008", "m_OverrideReferenceName": "_AmbientOcclusion", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 1.0, "m_FloatType": 0, @@ -2828,7 +2974,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -2877,10 +3022,10 @@ "m_Id": 0, "m_DisplayName": "ThreadMap", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -2890,7 +3035,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2958,6 +3102,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2998,6 +3143,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -3010,7 +3156,6 @@ "m_Id": 1, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3038,7 +3183,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3066,7 +3210,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -3090,8 +3233,32 @@ "m_ObjectId": "addd02d1c7c840c0982f4a1a282501cb", "m_Title": "Ambient Occlusion", "m_Position": { - "x": -386.0, - "y": 445.0 + "x": -470.0, + "y": 450.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "ae7f3eee64784528a019124a5c8760f0", + "m_Id": 1, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "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 } } @@ -3102,7 +3269,6 @@ "m_Id": 1, "m_DisplayName": "In Min Max", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "InMinMax", "m_StageCapability": 3, @@ -3146,6 +3312,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3155,18 +3322,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "b5587cfc8ee94bf8aec4c4ae1e963732", "m_Guid": { "m_GuidSerialized": "e96918ee-3bfd-4c51-b6d2-54b34d9ad706" }, "m_Name": "Thread Normal Strength", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_3DE8C8A3", "m_OverrideReferenceName": "_ThreadNormalStrength", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.5, "m_FloatType": 1, @@ -3183,7 +3355,6 @@ "m_Id": 1, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3227,6 +3398,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3261,6 +3433,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3269,6 +3442,43 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SaturateNode", + "m_ObjectId": "c033d4389cf54046bf7a711bb51beb07", + "m_Group": { + "m_Id": "addd02d1c7c840c0982f4a1a282501cb" + }, + "m_Name": "Saturate", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -254.0, + "y": 615.0, + "width": 128.0, + "height": 94.0 + } + }, + "m_Slots": [ + { + "m_Id": "5ffc0b3bc6b64a2b83a785101fb32c19" + }, + { + "m_Id": "eb23ee3850ff403d967c4078d85e27de" + } + ], + "synonyms": [ + "clamp" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.GroupData", @@ -3287,7 +3497,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -3355,6 +3564,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3370,7 +3580,6 @@ "m_Id": 0, "m_DisplayName": "Smoothness", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3388,7 +3597,6 @@ "m_Id": 0, "m_DisplayName": "Use Thread Map", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3403,7 +3611,6 @@ "m_Id": 3, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3439,7 +3646,6 @@ "m_Id": 2, "m_DisplayName": "False", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "False", "m_StageCapability": 3, @@ -3464,7 +3670,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3492,7 +3697,6 @@ "m_Id": 1, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3517,7 +3721,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -3567,11 +3770,16 @@ "m_GuidSerialized": "d6aaba38-49a3-41d1-8163-914932324589" }, "m_Name": "Use Thread Map", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Boolean_AA2071D6", "m_OverrideReferenceName": "_UseThreadMap", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": true } @@ -3611,6 +3819,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3628,7 +3837,6 @@ "m_Id": 0, "m_DisplayName": "RGBA", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "RGBA", "m_StageCapability": 2, @@ -3654,7 +3862,6 @@ "m_Id": 3, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3704,6 +3911,44 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SaturateNode", + "m_ObjectId": "de0d06640c6d43fcbe91127b77ce92e3", + "m_Group": { + "m_Id": "3afed62abb5b4810a8359bbc547f9686" + }, + "m_Name": "Saturate", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -425.0, + "y": 325.0, + "width": 128.0, + "height": 94.0 + } + }, + "m_Slots": [ + { + "m_Id": "0d1a99acdbbd48e1a8500c722187ded9" + }, + { + "m_Id": "ae7f3eee64784528a019124a5c8760f0" + } + ], + "synonyms": [ + "clamp" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -3716,7 +3961,6 @@ "m_Id": 6, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 2, @@ -3734,7 +3978,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -3811,11 +4054,36 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "eb23ee3850ff403d967c4078d85e27de", + "m_Id": 1, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "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.DynamicVectorMaterialSlot", @@ -3823,7 +4091,6 @@ "m_Id": 2, "m_DisplayName": "False", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "False", "m_StageCapability": 3, @@ -3848,7 +4115,6 @@ "m_Id": 0, "m_DisplayName": "Predicate", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Predicate", "m_StageCapability": 3, @@ -3863,7 +4129,6 @@ "m_Id": 0, "m_DisplayName": "Predicate", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Predicate", "m_StageCapability": 3, @@ -3878,7 +4143,6 @@ "m_Id": 4, "m_DisplayName": "Alpha", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Alpha", "m_StageCapability": 2, @@ -3896,7 +4160,6 @@ "m_Id": 0, "m_DisplayName": "Use Thread Map", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3911,10 +4174,10 @@ "m_Id": 1, "m_DisplayName": "Texture", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Texture", "m_StageCapability": 3, + "m_BareResource": false, "m_Texture": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" @@ -3934,9 +4197,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 265.0, - "y": 565.0, - "width": 161.0, + "x": 350.0, + "y": 567.0, + "width": 170.0, "height": 142.0 } }, @@ -3957,6 +4220,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -3969,7 +4233,6 @@ "m_Id": 2, "m_DisplayName": "Out Min Max", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "OutMinMax", "m_StageCapability": 3, @@ -3994,7 +4257,6 @@ "m_Id": 1, "m_DisplayName": "X", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "X", "m_StageCapability": 3,