diff --git a/Runtime/Shaders/ShaderGraph/TextureTransform.shadersubgraph b/Runtime/Shaders/ShaderGraph/TextureTransform.shadersubgraph index 28c5a514c..064f53ed4 100644 --- a/Runtime/Shaders/ShaderGraph/TextureTransform.shadersubgraph +++ b/Runtime/Shaders/ShaderGraph/TextureTransform.shadersubgraph @@ -19,6 +19,9 @@ "m_Keywords": [ { "m_Id": "56d9a937ceac4565b9af6f99ea5e08d7" + }, + { + "m_Id": "1d79aad20de94e19b191d087f66ad3a4" } ], "m_Dropdowns": [], @@ -93,6 +96,15 @@ }, { "m_Id": "c1248bbb0c1f483089bbf98e64ff5d96" + }, + { + "m_Id": "580e41aae5fd4e6793cd43b2fad1ac61" + }, + { + "m_Id": "7b7b83eb4b5e43649c1c0e8735d3ccf0" + }, + { + "m_Id": "b0b94af219dc47c38aee9594196909ff" } ], "m_GroupDatas": [], @@ -191,9 +203,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "f0d3ab8b87c4459d8a6d9162da0b7386" + "m_Id": "b0b94af219dc47c38aee9594196909ff" }, - "m_SlotId": 0 + "m_SlotId": 2 } }, { @@ -205,23 +217,23 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "9a922e6e719848598cb9ed1c4339773c" + "m_Id": "580e41aae5fd4e6793cd43b2fad1ac61" }, - "m_SlotId": 1 + "m_SlotId": 2 } }, { "m_OutputSlot": { "m_Node": { - "m_Id": "3456cd311347447c9af3c6631e485850" + "m_Id": "580e41aae5fd4e6793cd43b2fad1ac61" }, - "m_SlotId": 4 + "m_SlotId": 0 }, "m_InputSlot": { "m_Node": { - "m_Id": "27b8e9e16e03474f92d540ae01c669d7" + "m_Id": "9a922e6e719848598cb9ed1c4339773c" }, - "m_SlotId": 3 + "m_SlotId": 1 } }, { @@ -252,6 +264,34 @@ "m_SlotId": 1 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "7b7b83eb4b5e43649c1c0e8735d3ccf0" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "3456cd311347447c9af3c6631e485850" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "7b7b83eb4b5e43649c1c0e8735d3ccf0" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "580e41aae5fd4e6793cd43b2fad1ac61" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -294,6 +334,20 @@ "m_SlotId": 1 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "99cba88abd1448caa209aa4cf422b329" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "b0b94af219dc47c38aee9594196909ff" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -308,6 +362,20 @@ "m_SlotId": 2 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "b0b94af219dc47c38aee9594196909ff" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "f0d3ab8b87c4459d8a6d9162da0b7386" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -336,6 +404,20 @@ "m_SlotId": 1 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "c1248bbb0c1f483089bbf98e64ff5d96" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "27b8e9e16e03474f92d540ae01c669d7" + }, + "m_SlotId": 3 + } + }, { "m_OutputSlot": { "m_Node": { @@ -675,6 +757,30 @@ "m_DefaultType": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "1c3a35fc49d048f28b5744c3a19eca4b", + "m_Id": 2, + "m_DisplayName": "Off", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Off", + "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", @@ -699,6 +805,47 @@ } } +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.ShaderKeyword", + "m_ObjectId": "1d79aad20de94e19b191d087f66ad3a4", + "m_Guid": { + "m_GuidSerialized": "1d5b1a6a-75f0-450b-9a60-e35df192360a" + }, + "m_Name": "MaterialX", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "MaterialX", + "m_DefaultReferenceName": "MATERIALX", + "m_OverrideReferenceName": "MATERIAL_X", + "m_GeneratePropertyBlock": false, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_KeywordType": 0, + "m_KeywordDefinition": 2, + "m_KeywordScope": 1, + "m_KeywordStages": 63, + "m_Entries": [], + "m_Value": 0, + "m_IsEditable": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "1ec7191752204f0ba54cbb5611c2e9b0", + "m_Id": 4, + "m_DisplayName": "W", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "W", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [ + "W" + ] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector2Node", @@ -851,10 +998,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 767.0001220703125, - "y": -155.99998474121095, - "width": 142.99993896484376, - "height": 100.99995422363281 + "x": 911.5001831054688, + "y": -842.5000610351563, + "width": 142.50006103515626, + "height": 125.0 } }, "m_Slots": [ @@ -905,10 +1052,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -874.0, - "y": 85.0, - "width": 104.0, - "height": 34.0 + "x": -1019.0, + "y": 84.99994659423828, + "width": 103.5, + "height": 34.000022888183597 } }, "m_Slots": [ @@ -940,10 +1087,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -729.0, - "y": 57.00001907348633, + "x": -873.9999389648438, + "y": 56.9999885559082, "width": 290.0, - "height": 117.99995422363281 + "height": 117.99996948242188 } }, "m_Slots": [ @@ -988,9 +1135,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -67.0, - "y": -455.0, - "width": 290.0, + "x": -80.99999237060547, + "y": -761.4999389648438, + "width": 290.0000305175781, "height": 118.0 } }, @@ -1181,6 +1328,30 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "3c30dc982ca74722beb02471a2522191", + "m_Id": 2, + "m_DisplayName": "Off", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Off", + "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", @@ -1267,6 +1438,30 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "4371a1dd8fdb4c52abeeafa40f989388", + "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.Texture2DMaterialSlot", @@ -1366,6 +1561,62 @@ "m_IsEditable": true } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.KeywordNode", + "m_ObjectId": "580e41aae5fd4e6793cd43b2fad1ac61", + "m_Group": { + "m_Id": "" + }, + "m_Name": "MaterialX", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 326.4999694824219, + "y": -702.5000610351563, + "width": 138.5001220703125, + "height": 117.99993896484375 + } + }, + "m_Slots": [ + { + "m_Id": "f205da333b1a4a86846033d9b4b0b0e6" + }, + { + "m_Id": "83f70a85463e43d5a8feb0756a5ca165" + }, + { + "m_Id": "3c30dc982ca74722beb02471a2522191" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Keyword": { + "m_Id": "1d79aad20de94e19b191d087f66ad3a4" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "58f930bd54e140dca88810ad7729a012", + "m_Id": 1, + "m_DisplayName": "X", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "X", + "m_StageCapability": 3, + "m_Value": 1.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -1390,6 +1641,30 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "6190572d835b4f06a96a1891f5521b30", + "m_Id": 1, + "m_DisplayName": "On", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "On", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", @@ -1415,6 +1690,23 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "65c9f532898a496da96d3fdfd1018bdb", + "m_Id": 2, + "m_DisplayName": "Y", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Y", + "m_StageCapability": 3, + "m_Value": 1.0, + "m_DefaultValue": 0.0, + "m_Labels": [ + "Y" + ] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot", @@ -1627,6 +1919,78 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "798d41923a124230822d5291cf256206", + "m_Id": 3, + "m_DisplayName": "Z", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Z", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [ + "Z" + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4Node", + "m_ObjectId": "7b7b83eb4b5e43649c1c0e8735d3ccf0", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Vector 4", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -369.9999084472656, + "y": -643.4999389648438, + "width": 130.99993896484376, + "height": 149.0 + } + }, + "m_Slots": [ + { + "m_Id": "58f930bd54e140dca88810ad7729a012" + }, + { + "m_Id": "65c9f532898a496da96d3fdfd1018bdb" + }, + { + "m_Id": "798d41923a124230822d5291cf256206" + }, + { + "m_Id": "1ec7191752204f0ba54cbb5611c2e9b0" + }, + { + "m_Id": "d86bbe9ed01840fb9d8c6c844b6024a1" + } + ], + "synonyms": [ + "4", + "v4", + "vec4", + "float4" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", @@ -1690,6 +2054,30 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "83f70a85463e43d5a8feb0756a5ca165", + "m_Id": 1, + "m_DisplayName": "On", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "On", + "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", @@ -1852,10 +2240,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -899.0, - "y": 139.0, - "width": 129.0, - "height": 34.0 + "x": -1044.0, + "y": 138.99998474121095, + "width": 129.00006103515626, + "height": 33.999969482421878 } }, "m_Slots": [ @@ -1887,10 +2275,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 259.0, - "y": -303.0, - "width": 130.0, - "height": 118.0 + "x": 495.0, + "y": -541.5000610351563, + "width": 129.5, + "height": 118.00003051757813 } }, "m_Slots": [ @@ -1978,6 +2366,47 @@ "m_BareResource": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.KeywordNode", + "m_ObjectId": "b0b94af219dc47c38aee9594196909ff", + "m_Group": { + "m_Id": "" + }, + "m_Name": "MaterialX", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -541.9999389648438, + "y": 126.9999771118164, + "width": 138.49990844726563, + "height": 117.99996185302735 + } + }, + "m_Slots": [ + { + "m_Id": "4371a1dd8fdb4c52abeeafa40f989388" + }, + { + "m_Id": "6190572d835b4f06a96a1891f5521b30" + }, + { + "m_Id": "1c3a35fc49d048f28b5744c3a19eca4b" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Keyword": { + "m_Id": "1d79aad20de94e19b191d087f66ad3a4" + } +} + { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector4ShaderProperty", @@ -2240,10 +2669,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -207.82611083984376, - "y": -459.1304626464844, - "width": 0.0, - "height": 0.0 + "x": -314.5, + "y": -842.5, + "width": 103.5, + "height": 34.0 } }, "m_Slots": [ @@ -2571,6 +3000,31 @@ "m_DefaultType": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "d86bbe9ed01840fb9d8c6c844b6024a1", + "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_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -2598,10 +3052,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 504.00006103515627, - "y": -274.0000305175781, - "width": 194.00006103515626, - "height": 118.00003051757813 + "x": 672.5, + "y": -553.5000610351563, + "width": 194.0001220703125, + "height": 117.99996948242188 } }, "m_Slots": [ @@ -2684,6 +3138,9 @@ }, { "m_Id": "b23804a2765f4d44bf943d308aa82893" + }, + { + "m_Id": "1d79aad20de94e19b191d087f66ad3a4" } ] } @@ -2910,6 +3367,30 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "f205da333b1a4a86846033d9b4b0b0e6", + "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.PropertyNode",