From 0dfdeb0094ae0ee03c8b54480583c408c6290bb2 Mon Sep 17 00:00:00 2001 From: Remi Chapelain Date: Tue, 23 Nov 2021 16:54:51 +0100 Subject: [PATCH 1/3] Add raytracing node to prevent custom intepolators --- .../Material/Nature/SpeedTree8.shadergraph | 697 +++++++++++++++++- 1 file changed, 679 insertions(+), 18 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Nature/SpeedTree8.shadergraph b/com.unity.render-pipelines.high-definition/Runtime/Material/Nature/SpeedTree8.shadergraph index 93016f95bd6..954da4f0786 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/Nature/SpeedTree8.shadergraph +++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Nature/SpeedTree8.shadergraph @@ -61,6 +61,9 @@ }, { "m_Id": "634c255335cd4db09ac805304e2bc617" + }, + { + "m_Id": "4f5bf1165624464d8eae221b723a729c" } ], "m_Dropdowns": [], @@ -270,6 +273,24 @@ }, { "m_Id": "2aee7981909e441b83ee82aeac14e4bc" + }, + { + "m_Id": "d29e5dbdb2f14bc095d5f4b56f9253b6" + }, + { + "m_Id": "13ee85feb3594d2f838f80dad5390a66" + }, + { + "m_Id": "a907c15824534e8da30e86ac32094bef" + }, + { + "m_Id": "d5058d799ca9462891a928a773ccdc85" + }, + { + "m_Id": "f34eb7a308ae46759390c781d42bb778" + }, + { + "m_Id": "6e5e900177c44150982d6a3ec782a6ca" } ], "m_GroupDatas": [ @@ -372,6 +393,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "13ee85feb3594d2f838f80dad5390a66" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "d29e5dbdb2f14bc095d5f4b56f9253b6" + }, + "m_SlotId": 2 + } + }, { "m_OutputSlot": { "m_Node": { @@ -395,9 +430,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "4412f1dc4aa7492f86114fbffca3cf80" + "m_Id": "a907c15824534e8da30e86ac32094bef" }, - "m_SlotId": 2064554629 + "m_SlotId": 1 } }, { @@ -493,9 +528,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "4412f1dc4aa7492f86114fbffca3cf80" + "m_Id": "d29e5dbdb2f14bc095d5f4b56f9253b6" }, - "m_SlotId": 2074262670 + "m_SlotId": 1 } }, { @@ -680,6 +715,20 @@ "m_SlotId": 1104155697 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "6e5e900177c44150982d6a3ec782a6ca" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "4412f1dc4aa7492f86114fbffca3cf80" + }, + "m_SlotId": -1960380622 + } + }, { "m_OutputSlot": { "m_Node": { @@ -731,9 +780,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "4412f1dc4aa7492f86114fbffca3cf80" + "m_Id": "6e5e900177c44150982d6a3ec782a6ca" }, - "m_SlotId": -1960380622 + "m_SlotId": 1 } }, { @@ -834,6 +883,20 @@ "m_SlotId": 1 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "a907c15824534e8da30e86ac32094bef" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "4412f1dc4aa7492f86114fbffca3cf80" + }, + "m_SlotId": 2064554629 + } + }, { "m_OutputSlot": { "m_Node": { @@ -1002,6 +1065,20 @@ "m_SlotId": 1 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "d29e5dbdb2f14bc095d5f4b56f9253b6" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "4412f1dc4aa7492f86114fbffca3cf80" + }, + "m_SlotId": 2074262670 + } + }, { "m_OutputSlot": { "m_Node": { @@ -1016,6 +1093,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "d5058d799ca9462891a928a773ccdc85" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "6e5e900177c44150982d6a3ec782a6ca" + }, + "m_SlotId": 2 + } + }, { "m_OutputSlot": { "m_Node": { @@ -1058,6 +1149,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "f34eb7a308ae46759390c781d42bb778" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "a907c15824534e8da30e86ac32094bef" + }, + "m_SlotId": 2 + } + }, { "m_OutputSlot": { "m_Node": { @@ -1689,6 +1794,42 @@ "m_EnableGlobalMipBias": true } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalVectorNode", + "m_ObjectId": "13ee85feb3594d2f838f80dad5390a66", + "m_Group": { + "m_Id": "003b4ef77bba4db8a2543888cf83d33c" + }, + "m_Name": "Normal Vector", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1838.0001220703125, + "y": 864.5, + "width": 206.0001220703125, + "height": 130.5 + } + }, + "m_Slots": [ + { + "m_Id": "20331f46ae624b7f9a767cbd62433cc7" + } + ], + "synonyms": [ + "surface direction" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 2, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Space": 2 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot", @@ -1967,6 +2108,29 @@ "m_DefaultValue": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "20331f46ae624b7f9a767cbd62433cc7", + "m_Id": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", @@ -2033,10 +2197,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1582.0001220703125, - "y": 625.3333129882813, - "width": 247.3333740234375, - "height": 94.00000762939453 + "x": -1877.0, + "y": 526.5, + "width": 245.0, + "height": 94.0 } }, "m_Slots": [ @@ -2305,6 +2469,30 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "2ae8213ff3bd495195d614e0dfca9753", + "m_Id": 1, + "m_DisplayName": "Default", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "DEFAULT", + "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.AbsoluteNode", @@ -2608,6 +2796,30 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "35e6b0840106421bb6b3c578ca74a30c", + "m_Id": 2, + "m_DisplayName": "Raytraced", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "RAYTRACED", + "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.BlockNode", @@ -2701,10 +2913,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1567.33349609375, - "y": 719.3333740234375, - "width": 232.666748046875, - "height": 94.00000762939453 + "x": -1863.5, + "y": 770.5, + "width": 231.5, + "height": 94.0 } }, "m_Slots": [ @@ -3038,6 +3250,9 @@ }, { "m_Id": "634c255335cd4db09ac805304e2bc617" + }, + { + "m_Id": "4f5bf1165624464d8eae221b723a729c" } ] } @@ -3262,6 +3477,30 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "4cdfd47507a04773931cf0c930b725de", + "m_Id": 2, + "m_DisplayName": "Raytraced", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "RAYTRACED", + "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.Vector3MaterialSlot", @@ -3285,6 +3524,42 @@ "m_Labels": [] } +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.ShaderKeyword", + "m_ObjectId": "4f5bf1165624464d8eae221b723a729c", + "m_Guid": { + "m_GuidSerialized": "458874a2-ee16-4eaf-b856-83d6ec3235b0" + }, + "m_Name": "Raytracing Quality", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Raytracing Quality", + "m_DefaultReferenceName": "RAYTRACING_QUALITY", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": false, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_KeywordType": 1, + "m_KeywordDefinition": 2, + "m_KeywordScope": 1, + "m_KeywordStages": 63, + "m_Entries": [ + { + "id": 1, + "displayName": "Default", + "referenceName": "DEFAULT" + }, + { + "id": 2, + "displayName": "Raytraced", + "referenceName": "RAYTRACED" + } + ], + "m_Value": 0, + "m_IsEditable": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -3366,6 +3641,30 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "503a1ecc69684af59c38135bf839d8b6", + "m_Id": 0, + "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.KeywordNode", @@ -3771,6 +4070,30 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "5f1e9bc9556d4232a184ea77da2b979e", + "m_Id": 2, + "m_DisplayName": "Raytraced", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "RAYTRACED", + "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.BlockNode", @@ -4199,6 +4522,48 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.KeywordNode", + "m_ObjectId": "6e5e900177c44150982d6a3ec782a6ca", + "m_Group": { + "m_Id": "003b4ef77bba4db8a2543888cf83d33c" + }, + "m_Name": "Raytracing Quality", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1547.0, + "y": 441.5, + "width": 175.0, + "height": 118.0 + } + }, + "m_Slots": [ + { + "m_Id": "503a1ecc69684af59c38135bf839d8b6" + }, + { + "m_Id": "2ae8213ff3bd495195d614e0dfca9753" + }, + { + "m_Id": "5f1e9bc9556d4232a184ea77da2b979e" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Keyword": { + "m_Id": "4f5bf1165624464d8eae221b723a729c" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", @@ -4651,10 +5016,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1574.666748046875, - "y": 531.3333740234375, - "width": 240.0, - "height": 94.00000762939453 + "x": -1869.9998779296875, + "y": 289.5, + "width": 238.0, + "height": 94.0 } }, "m_Slots": [ @@ -5269,6 +5634,30 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "9ab577891a4847229453296f410a8b4d", + "m_Id": 0, + "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", @@ -5532,6 +5921,30 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "a66e09c795c04a0da7e2131ff5d62878", + "m_Id": 1, + "m_DisplayName": "Default", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "DEFAULT", + "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.PositionMaterialSlot", @@ -5616,6 +6029,48 @@ "m_IsEditable": true } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.KeywordNode", + "m_ObjectId": "a907c15824534e8da30e86ac32094bef", + "m_Group": { + "m_Id": "003b4ef77bba4db8a2543888cf83d33c" + }, + "m_Name": "Raytracing Quality", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1547.0, + "y": 586.0, + "width": 175.0, + "height": 118.0 + } + }, + "m_Slots": [ + { + "m_Id": "b7af78c25a1d4040b2f0c1eb90222909" + }, + { + "m_Id": "a66e09c795c04a0da7e2131ff5d62878" + }, + { + "m_Id": "4cdfd47507a04773931cf0c930b725de" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Keyword": { + "m_Id": "4f5bf1165624464d8eae221b723a729c" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", @@ -6136,6 +6591,30 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "b7af78c25a1d4040b2f0c1eb90222909", + "m_Id": 0, + "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.BlockNode", @@ -6827,6 +7306,29 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "c8ea522f7391425d9063b78b59cca217", + "m_Id": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -7109,6 +7611,48 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.KeywordNode", + "m_ObjectId": "d29e5dbdb2f14bc095d5f4b56f9253b6", + "m_Group": { + "m_Id": "003b4ef77bba4db8a2543888cf83d33c" + }, + "m_Name": "Raytracing Quality", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1547.0, + "y": 722.0, + "width": 175.0, + "height": 118.0 + } + }, + "m_Slots": [ + { + "m_Id": "9ab577891a4847229453296f410a8b4d" + }, + { + "m_Id": "f051efb87e9d423f8526f6594091fcee" + }, + { + "m_Id": "35e6b0840106421bb6b3c578ca74a30c" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Keyword": { + "m_Id": "4f5bf1165624464d8eae221b723a729c" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -7163,6 +7707,40 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.TangentVectorNode", + "m_ObjectId": "d5058d799ca9462891a928a773ccdc85", + "m_Group": { + "m_Id": "003b4ef77bba4db8a2543888cf83d33c" + }, + "m_Name": "Tangent Vector", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1837.9998779296875, + "y": 383.5, + "width": 206.0, + "height": 130.5 + } + }, + "m_Slots": [ + { + "m_Id": "c8ea522f7391425d9063b78b59cca217" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 2, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Space": 2 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", @@ -7582,6 +8160,29 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "e98e4bf9d70a4b8ead8ba8b33a81ba3f", + "m_Id": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -7717,6 +8318,30 @@ "m_SerializedDescriptor": "VertexDescription.Normal" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "f051efb87e9d423f8526f6594091fcee", + "m_Id": 1, + "m_DisplayName": "Default", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "DEFAULT", + "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", @@ -7765,6 +8390,42 @@ "m_DefaultValue": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BitangentVectorNode", + "m_ObjectId": "f34eb7a308ae46759390c781d42bb778", + "m_Group": { + "m_Id": "003b4ef77bba4db8a2543888cf83d33c" + }, + "m_Name": "Bitangent Vector", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1838.0001220703125, + "y": 620.5, + "width": 206.0001220703125, + "height": 130.5 + } + }, + "m_Slots": [ + { + "m_Id": "e98e4bf9d70a4b8ead8ba8b33a81ba3f" + } + ], + "synonyms": [ + "binormal" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 2, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Space": 2 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.SubGraphNode", From 532c3e3749d3ac62c3a640f1e3d75e7009ab0cf5 Mon Sep 17 00:00:00 2001 From: Remi Chapelain Date: Tue, 23 Nov 2021 17:04:59 +0100 Subject: [PATCH 2/3] changelog --- com.unity.render-pipelines.high-definition/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index e91db2633de..315e3115fb1 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed stackLit coat screen space reflection and raytrace reflection light hierarchy and IBL fallback - Fixed compilation errors from Path Tracing on the PS5 build. - Fixed custom shader GUI for material inspector. +- Fixed SpeedTree graph compatibility by adding raytracing quality keyword to provide a safe path. ### Changed - Optimizations for the physically based depth of field. From ae04de00ee35b78575bd4aeecae79f2133e64931 Mon Sep 17 00:00:00 2001 From: Remi Chapelain Date: Tue, 23 Nov 2021 17:58:12 +0100 Subject: [PATCH 3/3] Remove custom interpolators --- .../Material/Nature/SpeedTree8.shadergraph | 1103 +---------------- 1 file changed, 37 insertions(+), 1066 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Nature/SpeedTree8.shadergraph b/com.unity.render-pipelines.high-definition/Runtime/Material/Nature/SpeedTree8.shadergraph index 954da4f0786..da31026b84b 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/Nature/SpeedTree8.shadergraph +++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Nature/SpeedTree8.shadergraph @@ -211,33 +211,6 @@ { "m_Id": "d2424291c0f7420f9a0660b7051f84dc" }, - { - "m_Id": "fa323d4bae5143cc9fe1800551d7a848" - }, - { - "m_Id": "f467da04bb444463b72f53b3f66c0abb" - }, - { - "m_Id": "b69999c2c95d45b0b83f148e520eb8fb" - }, - { - "m_Id": "8d32abe58e6e40b0a4fc031a38667c4c" - }, - { - "m_Id": "db6cf405b16549c09ffd857c4038ed05" - }, - { - "m_Id": "5e1872b31dae4c5babc052603013756c" - }, - { - "m_Id": "3c0ce6bb9d7b4b0ca739d80d08d01ec2" - }, - { - "m_Id": "7f05288565444593974a63457ca1488c" - }, - { - "m_Id": "23a893b4f0f14c3081a0e3d8d8af329d" - }, { "m_Id": "397ebd2291d549ae81cd390ada59d916" }, @@ -274,23 +247,14 @@ { "m_Id": "2aee7981909e441b83ee82aeac14e4bc" }, - { - "m_Id": "d29e5dbdb2f14bc095d5f4b56f9253b6" - }, { "m_Id": "13ee85feb3594d2f838f80dad5390a66" }, - { - "m_Id": "a907c15824534e8da30e86ac32094bef" - }, { "m_Id": "d5058d799ca9462891a928a773ccdc85" }, { "m_Id": "f34eb7a308ae46759390c781d42bb778" - }, - { - "m_Id": "6e5e900177c44150982d6a3ec782a6ca" } ], "m_GroupDatas": [ @@ -402,9 +366,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "d29e5dbdb2f14bc095d5f4b56f9253b6" + "m_Id": "4412f1dc4aa7492f86114fbffca3cf80" }, - "m_SlotId": 2 + "m_SlotId": 2074262670 } }, { @@ -421,20 +385,6 @@ "m_SlotId": 0 } }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "23a893b4f0f14c3081a0e3d8d8af329d" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "a907c15824534e8da30e86ac32094bef" - }, - "m_SlotId": 1 - } - }, { "m_OutputSlot": { "m_Node": { @@ -519,20 +469,6 @@ "m_SlotId": 1313628562 } }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "3c0ce6bb9d7b4b0ca739d80d08d01ec2" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "d29e5dbdb2f14bc095d5f4b56f9253b6" - }, - "m_SlotId": 1 - } - }, { "m_OutputSlot": { "m_Node": { @@ -645,20 +581,6 @@ "m_SlotId": 0 } }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "5e1872b31dae4c5babc052603013756c" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "b69999c2c95d45b0b83f148e520eb8fb" - }, - "m_SlotId": 0 - } - }, { "m_OutputSlot": { "m_Node": { @@ -715,20 +637,6 @@ "m_SlotId": 1104155697 } }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "6e5e900177c44150982d6a3ec782a6ca" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "4412f1dc4aa7492f86114fbffca3cf80" - }, - "m_SlotId": -1960380622 - } - }, { "m_OutputSlot": { "m_Node": { @@ -771,20 +679,6 @@ "m_SlotId": 1 } }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "7f05288565444593974a63457ca1488c" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "6e5e900177c44150982d6a3ec782a6ca" - }, - "m_SlotId": 1 - } - }, { "m_OutputSlot": { "m_Node": { @@ -799,20 +693,6 @@ "m_SlotId": 1 } }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "8d32abe58e6e40b0a4fc031a38667c4c" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "fa323d4bae5143cc9fe1800551d7a848" - }, - "m_SlotId": 0 - } - }, { "m_OutputSlot": { "m_Node": { @@ -883,20 +763,6 @@ "m_SlotId": 1 } }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "a907c15824534e8da30e86ac32094bef" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "4412f1dc4aa7492f86114fbffca3cf80" - }, - "m_SlotId": 2064554629 - } - }, { "m_OutputSlot": { "m_Node": { @@ -1065,20 +931,6 @@ "m_SlotId": 1 } }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "d29e5dbdb2f14bc095d5f4b56f9253b6" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "4412f1dc4aa7492f86114fbffca3cf80" - }, - "m_SlotId": 2074262670 - } - }, { "m_OutputSlot": { "m_Node": { @@ -1102,9 +954,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "6e5e900177c44150982d6a3ec782a6ca" + "m_Id": "4412f1dc4aa7492f86114fbffca3cf80" }, - "m_SlotId": 2 + "m_SlotId": -1960380622 } }, { @@ -1135,20 +987,6 @@ "m_SlotId": 1 } }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "db6cf405b16549c09ffd857c4038ed05" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "f467da04bb444463b72f53b3f66c0abb" - }, - "m_SlotId": 0 - } - }, { "m_OutputSlot": { "m_Node": { @@ -1158,9 +996,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "a907c15824534e8da30e86ac32094bef" + "m_Id": "4412f1dc4aa7492f86114fbffca3cf80" }, - "m_SlotId": 2 + "m_SlotId": 2064554629 } }, { @@ -1220,15 +1058,6 @@ }, { "m_Id": "c5bd883ee36b4a0eb5a4824a41fc7849" - }, - { - "m_Id": "fa323d4bae5143cc9fe1800551d7a848" - }, - { - "m_Id": "f467da04bb444463b72f53b3f66c0abb" - }, - { - "m_Id": "b69999c2c95d45b0b83f148e520eb8fb" } ] }, @@ -1296,8 +1125,8 @@ "m_ObjectId": "003b4ef77bba4db8a2543888cf83d33c", "m_Title": "Normals", "m_Position": { - "x": -1671.0, - "y": 423.0 + "x": -1863.0, + "y": 325.0 } } @@ -1628,29 +1457,6 @@ ] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", - "m_ObjectId": "0bddee461ecf4ba88db97f6f213782fc", - "m_Id": 0, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 1.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -1806,9 +1612,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1838.0001220703125, - "y": 864.5, - "width": 206.0001220703125, + "x": -1632.0, + "y": 775.0, + "width": 206.0, "height": 130.5 } }, @@ -2185,41 +1991,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.CustomInterpolatorNode", - "m_ObjectId": "23a893b4f0f14c3081a0e3d8d8af329d", - "m_Group": { - "m_Id": "003b4ef77bba4db8a2543888cf83d33c" - }, - "m_Name": "BitangentWS (Custom Interpolator)", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -1877.0, - "y": 526.5, - "width": 245.0, - "height": 94.0 - } - }, - "m_Slots": [ - { - "m_Id": "90ddfdf80526456a883f8c39cea7a4bb" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": false, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "customBlockNodeName": "BitangentWS", - "serializedType": 3 -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", @@ -2469,30 +2240,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "2ae8213ff3bd495195d614e0dfca9753", - "m_Id": 1, - "m_DisplayName": "Default", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "DEFAULT", - "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.AbsoluteNode", @@ -2641,29 +2388,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", - "m_ObjectId": "2f68a42c62aa4c978744b485cd563652", - "m_Id": 0, - "m_DisplayName": "NormalWS", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "NormalWS", - "m_StageCapability": 1, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -2798,34 +2522,10 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "35e6b0840106421bb6b3c578ca74a30c", - "m_Id": 2, - "m_DisplayName": "Raytraced", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "RAYTRACED", - "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.BlockNode", - "m_ObjectId": "397ebd2291d549ae81cd390ada59d916", - "m_Group": { - "m_Id": "" + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "397ebd2291d549ae81cd390ada59d916", + "m_Group": { + "m_Id": "" }, "m_Name": "SurfaceDescription.NormalWS", "m_DrawState": { @@ -2901,41 +2601,6 @@ ] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.CustomInterpolatorNode", - "m_ObjectId": "3c0ce6bb9d7b4b0ca739d80d08d01ec2", - "m_Group": { - "m_Id": "003b4ef77bba4db8a2543888cf83d33c" - }, - "m_Name": "NormalWS (Custom Interpolator)", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -1863.5, - "y": 770.5, - "width": 231.5, - "height": 94.0 - } - }, - "m_Slots": [ - { - "m_Id": "dc114caec7614bb7bc00309d195c197a" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": false, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "customBlockNodeName": "NormalWS", - "serializedType": 3 -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BranchNode", @@ -3454,53 +3119,6 @@ "m_SerializedDescriptor": "SurfaceDescription.Emission" } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", - "m_ObjectId": "4bc6b5a827cd40b5b41e366607c31f37", - "m_Id": 0, - "m_DisplayName": "TangentWS", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "TangentWS", - "m_StageCapability": 1, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "4cdfd47507a04773931cf0c930b725de", - "m_Id": 2, - "m_DisplayName": "Raytraced", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "RAYTRACED", - "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.Vector3MaterialSlot", @@ -3618,53 +3236,6 @@ "m_SerializedDescriptor": "SurfaceDescription.Smoothness" } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", - "m_ObjectId": "4fdb6984495047e1abf9f95ae8a957af", - "m_Id": 0, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 1.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "503a1ecc69684af59c38135bf839d8b6", - "m_Id": 0, - "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.KeywordNode", @@ -3860,29 +3431,6 @@ "m_Value": true } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", - "m_ObjectId": "5ae0a9e6792347b2973921ff54a74f90", - "m_Id": 0, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 1.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -4012,40 +3560,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BitangentVectorNode", - "m_ObjectId": "5e1872b31dae4c5babc052603013756c", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Bitangent Vector", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 198.6667022705078, - "y": -110.0000228881836, - "width": 206.0, - "height": 131.33334350585938 - } - }, - "m_Slots": [ - { - "m_Id": "0bddee461ecf4ba88db97f6f213782fc" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": false, - "m_DismissedVersion": 0, - "m_PreviewMode": 2, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_Space": 2 -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -4070,30 +3584,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "5f1e9bc9556d4232a184ea77da2b979e", - "m_Id": 2, - "m_DisplayName": "Raytraced", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "RAYTRACED", - "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.BlockNode", @@ -4522,48 +4012,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.KeywordNode", - "m_ObjectId": "6e5e900177c44150982d6a3ec782a6ca", - "m_Group": { - "m_Id": "003b4ef77bba4db8a2543888cf83d33c" - }, - "m_Name": "Raytracing Quality", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -1547.0, - "y": 441.5, - "width": 175.0, - "height": 118.0 - } - }, - "m_Slots": [ - { - "m_Id": "503a1ecc69684af59c38135bf839d8b6" - }, - { - "m_Id": "2ae8213ff3bd495195d614e0dfca9753" - }, - { - "m_Id": "5f1e9bc9556d4232a184ea77da2b979e" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": false, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_Keyword": { - "m_Id": "4f5bf1165624464d8eae221b723a729c" - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", @@ -5006,77 +4454,42 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.CustomInterpolatorNode", - "m_ObjectId": "7f05288565444593974a63457ca1488c", + "m_Type": "UnityEditor.ShaderGraph.ComparisonNode", + "m_ObjectId": "7f74930b8a10138e862e6b7d59bb1542", "m_Group": { - "m_Id": "003b4ef77bba4db8a2543888cf83d33c" + "m_Id": "" }, - "m_Name": "TangentWS (Custom Interpolator)", + "m_Name": "Comparison", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1869.9998779296875, - "y": 289.5, - "width": 238.0, - "height": 94.0 + "x": -502.00018310546877, + "y": 259.3333435058594, + "width": 144.66665649414063, + "height": 136.0 } }, "m_Slots": [ { - "m_Id": "ecbd9c270eb347d5ba9d0b180defce80" + "m_Id": "b5863f4bc1f3bf8fa7bdb8d83ae65fec" + }, + { + "m_Id": "0c0f8997128cc185b5ef22d01812937d" + }, + { + "m_Id": "276a19a29bea128092fc2388a825f23c" } ], "synonyms": [], "m_Precision": 0, - "m_PreviewExpanded": false, + "m_PreviewExpanded": true, "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, - "customBlockNodeName": "TangentWS", - "serializedType": 3 -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.ComparisonNode", - "m_ObjectId": "7f74930b8a10138e862e6b7d59bb1542", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Comparison", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -502.00018310546877, - "y": 259.3333435058594, - "width": 144.66665649414063, - "height": 136.0 - } - }, - "m_Slots": [ - { - "m_Id": "b5863f4bc1f3bf8fa7bdb8d83ae65fec" - }, - { - "m_Id": "0c0f8997128cc185b5ef22d01812937d" - }, - { - "m_Id": "276a19a29bea128092fc2388a825f23c" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_ComparisonType": 0 + "m_ComparisonType": 0 } { @@ -5426,63 +4839,6 @@ "m_SupportVFX": false } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.NormalVectorNode", - "m_ObjectId": "8d32abe58e6e40b0a4fc031a38667c4c", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Normal Vector", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 198.6667022705078, - "y": -373.9999694824219, - "width": 206.0, - "height": 130.6666717529297 - } - }, - "m_Slots": [ - { - "m_Id": "4fdb6984495047e1abf9f95ae8a957af" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": false, - "m_DismissedVersion": 0, - "m_PreviewMode": 2, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_Space": 2 -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", - "m_ObjectId": "90ddfdf80526456a883f8c39cea7a4bb", - "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 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -5634,30 +4990,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "9ab577891a4847229453296f410a8b4d", - "m_Id": 0, - "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", @@ -5921,30 +5253,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "a66e09c795c04a0da7e2131ff5d62878", - "m_Id": 1, - "m_DisplayName": "Default", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "DEFAULT", - "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.PositionMaterialSlot", @@ -6029,48 +5337,6 @@ "m_IsEditable": true } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.KeywordNode", - "m_ObjectId": "a907c15824534e8da30e86ac32094bef", - "m_Group": { - "m_Id": "003b4ef77bba4db8a2543888cf83d33c" - }, - "m_Name": "Raytracing Quality", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -1547.0, - "y": 586.0, - "width": 175.0, - "height": 118.0 - } - }, - "m_Slots": [ - { - "m_Id": "b7af78c25a1d4040b2f0c1eb90222909" - }, - { - "m_Id": "a66e09c795c04a0da7e2131ff5d62878" - }, - { - "m_Id": "4cdfd47507a04773931cf0c930b725de" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": false, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_Keyword": { - "m_Id": "4f5bf1165624464d8eae221b723a729c" - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", @@ -6505,40 +5771,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "b69999c2c95d45b0b83f148e520eb8fb", - "m_Group": { - "m_Id": "" - }, - "m_Name": "VertexDescription.CustomInterpolator", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "c86b27c5aa114d4398b98b21c90a1c96" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "VertexDescription.BitangentWS#3" -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.GroupData", @@ -6591,30 +5823,6 @@ ] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "b7af78c25a1d4040b2f0c1eb90222909", - "m_Id": 0, - "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.BlockNode", @@ -7283,29 +6491,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", - "m_ObjectId": "c86b27c5aa114d4398b98b21c90a1c96", - "m_Id": 0, - "m_DisplayName": "BitangentWS", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "BitangentWS", - "m_StageCapability": 1, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", @@ -7611,48 +6796,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.KeywordNode", - "m_ObjectId": "d29e5dbdb2f14bc095d5f4b56f9253b6", - "m_Group": { - "m_Id": "003b4ef77bba4db8a2543888cf83d33c" - }, - "m_Name": "Raytracing Quality", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -1547.0, - "y": 722.0, - "width": 175.0, - "height": 118.0 - } - }, - "m_Slots": [ - { - "m_Id": "9ab577891a4847229453296f410a8b4d" - }, - { - "m_Id": "f051efb87e9d423f8526f6594091fcee" - }, - { - "m_Id": "35e6b0840106421bb6b3c578ca74a30c" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": false, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_Keyword": { - "m_Id": "4f5bf1165624464d8eae221b723a729c" - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -7719,8 +6862,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1837.9998779296875, - "y": 383.5, + "x": -1632.0, + "y": 514.0, "width": 206.0, "height": 130.5 } @@ -7868,63 +7011,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.TangentVectorNode", - "m_ObjectId": "db6cf405b16549c09ffd857c4038ed05", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Tangent Vector", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 198.6667022705078, - "y": -240.66665649414063, - "width": 206.0, - "height": 130.66665649414063 - } - }, - "m_Slots": [ - { - "m_Id": "5ae0a9e6792347b2973921ff54a74f90" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": false, - "m_DismissedVersion": 0, - "m_PreviewMode": 2, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_Space": 2 -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", - "m_ObjectId": "dc114caec7614bb7bc00309d195c197a", - "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 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", @@ -8198,29 +7284,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", - "m_ObjectId": "ecbd9c270eb347d5ba9d0b180defce80", - "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 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.SystemData", @@ -8318,30 +7381,6 @@ "m_SerializedDescriptor": "VertexDescription.Normal" } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "f051efb87e9d423f8526f6594091fcee", - "m_Id": 1, - "m_DisplayName": "Default", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "DEFAULT", - "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", @@ -8402,9 +7441,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1838.0001220703125, - "y": 620.5, - "width": 206.0001220703125, + "x": -1632.0, + "y": 644.5, + "width": 206.0, "height": 130.5 } }, @@ -8498,40 +7537,6 @@ "m_DropdownSelectedEntries": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "f467da04bb444463b72f53b3f66c0abb", - "m_Group": { - "m_Id": "" - }, - "m_Name": "VertexDescription.CustomInterpolator", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "4bc6b5a827cd40b5b41e366607c31f37" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "VertexDescription.TangentWS#3" -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -8678,40 +7683,6 @@ "m_DefaultType": 0 } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "fa323d4bae5143cc9fe1800551d7a848", - "m_Group": { - "m_Id": "" - }, - "m_Name": "VertexDescription.CustomInterpolator", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "2f68a42c62aa4c978744b485cd563652" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "VertexDescription.NormalWS#3" -} - { "m_SGVersion": 3, "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty",