feat: Main shader detailMap A & B
This commit is contained in:
Alexandre Coirier
@@ -3,9 +3,21 @@
|
||||
"m_Type": "UnityEditor.ShaderGraph.GraphData",
|
||||
"m_ObjectId": "611123bc58c149fea746dc85213d502f",
|
||||
"m_Properties": [
|
||||
{
|
||||
"m_Id": "4c76112170fd4b22b30eca3196ea7d9d"
|
||||
},
|
||||
{
|
||||
"m_Id": "4a3d921ea05040ff9f3d8fba2e31ed02"
|
||||
},
|
||||
{
|
||||
"m_Id": "d991dda24848414d81022ed33f3eb97c"
|
||||
},
|
||||
{
|
||||
"m_Id": "d8b68fd7729c41039dd3abc795440c55"
|
||||
},
|
||||
{
|
||||
"m_Id": "b895eb6f71ac4810a7fd92fac6d300bd"
|
||||
},
|
||||
{
|
||||
"m_Id": "6dce6170558c4ec283a6faa5df5bb7c4"
|
||||
},
|
||||
@@ -206,11 +218,37 @@
|
||||
},
|
||||
{
|
||||
"m_Id": "eb49a515d11f469aa87bb563411b22b8"
|
||||
},
|
||||
{
|
||||
"m_Id": "b5172e2b5c564e53a09c016c34c5fe74"
|
||||
},
|
||||
{
|
||||
"m_Id": "f3aecffeb464486d9e5ca19cd1f4bebc"
|
||||
},
|
||||
{
|
||||
"m_Id": "825c412518e748019232d7efaa5c4e64"
|
||||
},
|
||||
{
|
||||
"m_Id": "04fde7ea678941eebf73180cf99a9119"
|
||||
}
|
||||
],
|
||||
"m_GroupDatas": [],
|
||||
"m_StickyNoteDatas": [],
|
||||
"m_Edges": [
|
||||
{
|
||||
"m_OutputSlot": {
|
||||
"m_Node": {
|
||||
"m_Id": "04fde7ea678941eebf73180cf99a9119"
|
||||
},
|
||||
"m_SlotId": 0
|
||||
},
|
||||
"m_InputSlot": {
|
||||
"m_Node": {
|
||||
"m_Id": "c5d342277052409f87283f2c60ccf3a1"
|
||||
},
|
||||
"m_SlotId": 21
|
||||
}
|
||||
},
|
||||
{
|
||||
"m_OutputSlot": {
|
||||
"m_Node": {
|
||||
@@ -435,6 +473,20 @@
|
||||
"m_SlotId": 17
|
||||
}
|
||||
},
|
||||
{
|
||||
"m_OutputSlot": {
|
||||
"m_Node": {
|
||||
"m_Id": "825c412518e748019232d7efaa5c4e64"
|
||||
},
|
||||
"m_SlotId": 0
|
||||
},
|
||||
"m_InputSlot": {
|
||||
"m_Node": {
|
||||
"m_Id": "c5d342277052409f87283f2c60ccf3a1"
|
||||
},
|
||||
"m_SlotId": 23
|
||||
}
|
||||
},
|
||||
{
|
||||
"m_OutputSlot": {
|
||||
"m_Node": {
|
||||
@@ -561,6 +613,20 @@
|
||||
"m_SlotId": 15
|
||||
}
|
||||
},
|
||||
{
|
||||
"m_OutputSlot": {
|
||||
"m_Node": {
|
||||
"m_Id": "b5172e2b5c564e53a09c016c34c5fe74"
|
||||
},
|
||||
"m_SlotId": 0
|
||||
},
|
||||
"m_InputSlot": {
|
||||
"m_Node": {
|
||||
"m_Id": "c5d342277052409f87283f2c60ccf3a1"
|
||||
},
|
||||
"m_SlotId": 20
|
||||
}
|
||||
},
|
||||
{
|
||||
"m_OutputSlot": {
|
||||
"m_Node": {
|
||||
@@ -658,6 +724,20 @@
|
||||
},
|
||||
"m_SlotId": 0
|
||||
}
|
||||
},
|
||||
{
|
||||
"m_OutputSlot": {
|
||||
"m_Node": {
|
||||
"m_Id": "f3aecffeb464486d9e5ca19cd1f4bebc"
|
||||
},
|
||||
"m_SlotId": 0
|
||||
},
|
||||
"m_InputSlot": {
|
||||
"m_Node": {
|
||||
"m_Id": "c5d342277052409f87283f2c60ccf3a1"
|
||||
},
|
||||
"m_SlotId": 22
|
||||
}
|
||||
}
|
||||
],
|
||||
"m_VertexContext": {
|
||||
@@ -845,6 +925,42 @@
|
||||
"m_LiteralMode": false
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.PropertyNode",
|
||||
"m_ObjectId": "04fde7ea678941eebf73180cf99a9119",
|
||||
"m_Group": {
|
||||
"m_Id": ""
|
||||
},
|
||||
"m_Name": "Property",
|
||||
"m_DrawState": {
|
||||
"m_Expanded": true,
|
||||
"m_Position": {
|
||||
"serializedVersion": "2",
|
||||
"x": 594.0,
|
||||
"y": 1158.0001220703125,
|
||||
"width": 105.00006103515625,
|
||||
"height": 34.0
|
||||
}
|
||||
},
|
||||
"m_Slots": [
|
||||
{
|
||||
"m_Id": "1530c324e43f40aeaae57dec02103fdd"
|
||||
}
|
||||
],
|
||||
"synonyms": [],
|
||||
"m_Precision": 0,
|
||||
"m_PreviewExpanded": true,
|
||||
"m_DismissedVersion": 0,
|
||||
"m_PreviewMode": 0,
|
||||
"m_CustomColors": {
|
||||
"m_SerializableColors": []
|
||||
},
|
||||
"m_Property": {
|
||||
"m_Id": "b895eb6f71ac4810a7fd92fac6d300bd"
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.PropertyNode",
|
||||
@@ -857,9 +973,9 @@
|
||||
"m_Expanded": true,
|
||||
"m_Position": {
|
||||
"serializedVersion": "2",
|
||||
"x": 603.0,
|
||||
"y": 1058.0,
|
||||
"width": 97.0,
|
||||
"x": 595.0000610351563,
|
||||
"y": 1126.0001220703125,
|
||||
"width": 105.0,
|
||||
"height": 34.0
|
||||
}
|
||||
},
|
||||
@@ -1084,6 +1200,22 @@
|
||||
"m_Value": false
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
|
||||
"m_ObjectId": "1530c324e43f40aeaae57dec02103fdd",
|
||||
"m_Id": 0,
|
||||
"m_DisplayName": "SizeB",
|
||||
"m_SlotType": 1,
|
||||
"m_Hidden": false,
|
||||
"m_ShaderOutputName": "Out",
|
||||
"m_StageCapability": 3,
|
||||
"m_Value": 0.0,
|
||||
"m_DefaultValue": 0.0,
|
||||
"m_Labels": [],
|
||||
"m_LiteralMode": false
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
|
||||
@@ -1222,8 +1354,8 @@
|
||||
"m_Expanded": true,
|
||||
"m_Position": {
|
||||
"serializedVersion": "2",
|
||||
"x": 826.0000610351563,
|
||||
"y": 1141.0001220703125,
|
||||
"x": 814.0000610351563,
|
||||
"y": 1241.0001220703125,
|
||||
"width": 116.0,
|
||||
"height": 34.0
|
||||
}
|
||||
@@ -1390,6 +1522,22 @@
|
||||
"m_Value": false
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
|
||||
"m_ObjectId": "28dd5dc8acee4c7e83c3fda2e777b30f",
|
||||
"m_Id": 0,
|
||||
"m_DisplayName": "IntensityA",
|
||||
"m_SlotType": 1,
|
||||
"m_Hidden": false,
|
||||
"m_ShaderOutputName": "Out",
|
||||
"m_StageCapability": 3,
|
||||
"m_Value": 0.0,
|
||||
"m_DefaultValue": 0.0,
|
||||
"m_Labels": [],
|
||||
"m_LiteralMode": false
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot",
|
||||
@@ -1468,8 +1616,8 @@
|
||||
"m_Expanded": true,
|
||||
"m_Position": {
|
||||
"serializedVersion": "2",
|
||||
"x": 983.0000610351563,
|
||||
"y": 1058.0001220703125,
|
||||
"x": 971.0000610351563,
|
||||
"y": 1158.0001220703125,
|
||||
"width": 185.00006103515626,
|
||||
"height": 190.0
|
||||
}
|
||||
@@ -1713,8 +1861,20 @@
|
||||
{
|
||||
"m_Id": "504868b162d04f6ba141dd58a4060093"
|
||||
},
|
||||
{
|
||||
"m_Id": "d8b68fd7729c41039dd3abc795440c55"
|
||||
},
|
||||
{
|
||||
"m_Id": "b464deebe5304824b318bea0d83b973c"
|
||||
},
|
||||
{
|
||||
"m_Id": "4c76112170fd4b22b30eca3196ea7d9d"
|
||||
},
|
||||
{
|
||||
"m_Id": "d991dda24848414d81022ed33f3eb97c"
|
||||
},
|
||||
{
|
||||
"m_Id": "b895eb6f71ac4810a7fd92fac6d300bd"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1853,6 +2013,22 @@
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
|
||||
"m_ObjectId": "47ebc224ed984374a1f12d3ce805ca60",
|
||||
"m_Id": 0,
|
||||
"m_DisplayName": "IntensityB",
|
||||
"m_SlotType": 1,
|
||||
"m_Hidden": false,
|
||||
"m_ShaderOutputName": "Out",
|
||||
"m_StageCapability": 3,
|
||||
"m_Value": 0.0,
|
||||
"m_DefaultValue": 0.0,
|
||||
"m_Labels": [],
|
||||
"m_LiteralMode": false
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
|
||||
@@ -1869,6 +2045,22 @@
|
||||
"m_LiteralMode": false
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
|
||||
"m_ObjectId": "4961d3b3358f43cab81418dd63c325d2",
|
||||
"m_Id": 21,
|
||||
"m_DisplayName": "DetailSizeB",
|
||||
"m_SlotType": 0,
|
||||
"m_Hidden": false,
|
||||
"m_ShaderOutputName": "DetailSizeB",
|
||||
"m_StageCapability": 3,
|
||||
"m_Value": 0.0,
|
||||
"m_DefaultValue": 0.0,
|
||||
"m_Labels": [],
|
||||
"m_LiteralMode": false
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 1,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Matrix4ShaderProperty",
|
||||
@@ -1948,6 +2140,42 @@
|
||||
"m_BareResource": false
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty",
|
||||
"m_ObjectId": "4c76112170fd4b22b30eca3196ea7d9d",
|
||||
"m_Guid": {
|
||||
"m_GuidSerialized": "602aa36e-a45e-46c1-9c79-8e9b37f964ce"
|
||||
},
|
||||
"promotedFromAssetID": "",
|
||||
"promotedFromCategoryName": "",
|
||||
"promotedOrdering": -1,
|
||||
"m_Name": "DetailB",
|
||||
"m_DefaultRefNameVersion": 1,
|
||||
"m_RefNameGeneratedByDisplayName": "DetailB",
|
||||
"m_DefaultReferenceName": "_DetailB",
|
||||
"m_OverrideReferenceName": "_DetailMapB",
|
||||
"m_GeneratePropertyBlock": true,
|
||||
"m_UseCustomSlotLabel": false,
|
||||
"m_CustomSlotLabel": "",
|
||||
"m_DismissedVersion": 0,
|
||||
"m_Precision": 0,
|
||||
"overrideHLSLDeclaration": false,
|
||||
"hlslDeclarationOverride": 0,
|
||||
"m_Hidden": false,
|
||||
"m_PerRendererData": false,
|
||||
"m_customAttributes": [],
|
||||
"m_Value": {
|
||||
"m_SerializedTexture": "{\"texture\":{\"fileID\":2800000,\"guid\":\"9d9cc54c701e4c747acf8fa345bccb58\",\"type\":3}}",
|
||||
"m_Guid": ""
|
||||
},
|
||||
"isMainTexture": false,
|
||||
"useTilingAndOffset": false,
|
||||
"useTexelSize": true,
|
||||
"m_Modifiable": true,
|
||||
"m_DefaultType": 1
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 3,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty",
|
||||
@@ -2083,11 +2311,11 @@
|
||||
"promotedFromAssetID": "",
|
||||
"promotedFromCategoryName": "",
|
||||
"promotedOrdering": -1,
|
||||
"m_Name": "Detail",
|
||||
"m_Name": "DetailA",
|
||||
"m_DefaultRefNameVersion": 1,
|
||||
"m_RefNameGeneratedByDisplayName": "Detail",
|
||||
"m_DefaultReferenceName": "_Detail",
|
||||
"m_OverrideReferenceName": "_DetailMap",
|
||||
"m_RefNameGeneratedByDisplayName": "DetailA",
|
||||
"m_DefaultReferenceName": "_DetailA",
|
||||
"m_OverrideReferenceName": "_DetailMapA",
|
||||
"m_GeneratePropertyBlock": true,
|
||||
"m_UseCustomSlotLabel": false,
|
||||
"m_CustomSlotLabel": "",
|
||||
@@ -2099,7 +2327,7 @@
|
||||
"m_PerRendererData": false,
|
||||
"m_customAttributes": [],
|
||||
"m_Value": {
|
||||
"m_SerializedTexture": "{\"texture\":{\"fileID\":2800000,\"guid\":\"2da59fbd756c92a4bb2018abf06c4e07\",\"type\":3}}",
|
||||
"m_SerializedTexture": "{\"texture\":{\"fileID\":2800000,\"guid\":\"ac9246e67e5a7074891004cac50fa17b\",\"type\":3}}",
|
||||
"m_Guid": ""
|
||||
},
|
||||
"isMainTexture": false,
|
||||
@@ -2369,6 +2597,24 @@
|
||||
"m_SerializedDescriptor": "SurfaceDescription.BaseColor"
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot",
|
||||
"m_ObjectId": "5aa83171d7bf4e83948c0de8922c5d7f",
|
||||
"m_Id": 20,
|
||||
"m_DisplayName": "DetailTexB",
|
||||
"m_SlotType": 0,
|
||||
"m_Hidden": false,
|
||||
"m_ShaderOutputName": "DetailTexB",
|
||||
"m_StageCapability": 3,
|
||||
"m_BareResource": false,
|
||||
"m_Texture": {
|
||||
"m_SerializedTexture": "",
|
||||
"m_Guid": ""
|
||||
},
|
||||
"m_DefaultType": 0
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
|
||||
@@ -2494,9 +2740,9 @@
|
||||
"m_Expanded": true,
|
||||
"m_Position": {
|
||||
"serializedVersion": "2",
|
||||
"x": 544.9999389648438,
|
||||
"y": 568.0,
|
||||
"width": 114.00006103515625,
|
||||
"x": 569.0000610351563,
|
||||
"y": 557.0,
|
||||
"width": 121.0,
|
||||
"height": 34.0
|
||||
}
|
||||
},
|
||||
@@ -2547,8 +2793,8 @@
|
||||
"m_Position": {
|
||||
"serializedVersion": "2",
|
||||
"x": 583.0,
|
||||
"y": 1097.0,
|
||||
"width": 117.0,
|
||||
"y": 1192.0001220703125,
|
||||
"width": 117.00006103515625,
|
||||
"height": 34.0
|
||||
}
|
||||
},
|
||||
@@ -2787,8 +3033,8 @@
|
||||
"m_Expanded": true,
|
||||
"m_Position": {
|
||||
"serializedVersion": "2",
|
||||
"x": 826.0000610351563,
|
||||
"y": 1175.0001220703125,
|
||||
"x": 814.0000610351563,
|
||||
"y": 1275.0001220703125,
|
||||
"width": 115.0,
|
||||
"height": 34.0
|
||||
}
|
||||
@@ -3094,8 +3340,8 @@
|
||||
"m_Expanded": true,
|
||||
"m_Position": {
|
||||
"serializedVersion": "2",
|
||||
"x": 825.0000610351563,
|
||||
"y": 1209.0001220703125,
|
||||
"x": 813.0000610351563,
|
||||
"y": 1309.0001220703125,
|
||||
"width": 116.0,
|
||||
"height": 34.0
|
||||
}
|
||||
@@ -3141,6 +3387,42 @@
|
||||
"m_Labels": []
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.PropertyNode",
|
||||
"m_ObjectId": "825c412518e748019232d7efaa5c4e64",
|
||||
"m_Group": {
|
||||
"m_Id": ""
|
||||
},
|
||||
"m_Name": "Property",
|
||||
"m_DrawState": {
|
||||
"m_Expanded": true,
|
||||
"m_Position": {
|
||||
"serializedVersion": "2",
|
||||
"x": 573.0000610351563,
|
||||
"y": 1092.0001220703125,
|
||||
"width": 127.0,
|
||||
"height": 34.0
|
||||
}
|
||||
},
|
||||
"m_Slots": [
|
||||
{
|
||||
"m_Id": "47ebc224ed984374a1f12d3ce805ca60"
|
||||
}
|
||||
],
|
||||
"synonyms": [],
|
||||
"m_Precision": 0,
|
||||
"m_PreviewExpanded": true,
|
||||
"m_DismissedVersion": 0,
|
||||
"m_PreviewMode": 0,
|
||||
"m_CustomColors": {
|
||||
"m_SerializableColors": []
|
||||
},
|
||||
"m_Property": {
|
||||
"m_Id": "d991dda24848414d81022ed33f3eb97c"
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
|
||||
@@ -3211,9 +3493,9 @@
|
||||
"m_ShaderOutputName": "BaseColor",
|
||||
"m_StageCapability": 2,
|
||||
"m_Value": {
|
||||
"x": 1.0,
|
||||
"y": 1.0,
|
||||
"z": 1.0
|
||||
"x": 0.8679245114326477,
|
||||
"y": 0.8679245114326477,
|
||||
"z": 0.8679245114326477
|
||||
},
|
||||
"m_DefaultValue": {
|
||||
"x": 0.5,
|
||||
@@ -3692,7 +3974,7 @@
|
||||
"m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot",
|
||||
"m_ObjectId": "a2a075edb2e84c64b1aa438b512da6ab",
|
||||
"m_Id": 0,
|
||||
"m_DisplayName": "Detail",
|
||||
"m_DisplayName": "DetailA",
|
||||
"m_SlotType": 1,
|
||||
"m_Hidden": false,
|
||||
"m_ShaderOutputName": "Out",
|
||||
@@ -3702,18 +3984,15 @@
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
|
||||
"m_ObjectId": "a34a1ccc27e94fc8890ea8c79a176430",
|
||||
"m_Id": 14,
|
||||
"m_DisplayName": "DetailSize",
|
||||
"m_SlotType": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot",
|
||||
"m_ObjectId": "a32af8e110204ce6ae39abc3018a9735",
|
||||
"m_Id": 0,
|
||||
"m_DisplayName": "DetailB",
|
||||
"m_SlotType": 1,
|
||||
"m_Hidden": false,
|
||||
"m_ShaderOutputName": "DetailSize",
|
||||
"m_ShaderOutputName": "Out",
|
||||
"m_StageCapability": 3,
|
||||
"m_Value": 0.0,
|
||||
"m_DefaultValue": 0.0,
|
||||
"m_Labels": [],
|
||||
"m_LiteralMode": false
|
||||
"m_BareResource": false
|
||||
}
|
||||
|
||||
{
|
||||
@@ -3790,8 +4069,8 @@
|
||||
"m_Position": {
|
||||
"serializedVersion": "2",
|
||||
"x": 583.0,
|
||||
"y": 1199.0,
|
||||
"width": 117.0,
|
||||
"y": 1294.0001220703125,
|
||||
"width": 117.00006103515625,
|
||||
"height": 34.0
|
||||
}
|
||||
},
|
||||
@@ -3850,9 +4129,9 @@
|
||||
"m_Expanded": true,
|
||||
"m_Position": {
|
||||
"serializedVersion": "2",
|
||||
"x": 822.0000610351563,
|
||||
"y": 1107.0001220703125,
|
||||
"width": 114.0,
|
||||
"x": 810.0000610351563,
|
||||
"y": 1207.0001220703125,
|
||||
"width": 114.00006103515625,
|
||||
"height": 34.0
|
||||
}
|
||||
},
|
||||
@@ -3876,20 +4155,18 @@
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot",
|
||||
"m_ObjectId": "ab55036f97c64fcc877002909d03e43f",
|
||||
"m_Id": 13,
|
||||
"m_DisplayName": "DetailTex",
|
||||
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
|
||||
"m_ObjectId": "ab5e4947fae0436493254c5ab5f3a1c6",
|
||||
"m_Id": 23,
|
||||
"m_DisplayName": "DetailIntensityB",
|
||||
"m_SlotType": 0,
|
||||
"m_Hidden": false,
|
||||
"m_ShaderOutputName": "DetailTex",
|
||||
"m_ShaderOutputName": "DetailIntensityB",
|
||||
"m_StageCapability": 3,
|
||||
"m_BareResource": false,
|
||||
"m_Texture": {
|
||||
"m_SerializedTexture": "",
|
||||
"m_Guid": ""
|
||||
},
|
||||
"m_DefaultType": 0
|
||||
"m_Value": 0.0,
|
||||
"m_DefaultValue": 0.0,
|
||||
"m_Labels": [],
|
||||
"m_LiteralMode": false
|
||||
}
|
||||
|
||||
{
|
||||
@@ -4059,11 +4336,11 @@
|
||||
"promotedFromAssetID": "",
|
||||
"promotedFromCategoryName": "",
|
||||
"promotedOrdering": -1,
|
||||
"m_Name": "Size",
|
||||
"m_Name": "SizeA",
|
||||
"m_DefaultRefNameVersion": 1,
|
||||
"m_RefNameGeneratedByDisplayName": "Size",
|
||||
"m_DefaultReferenceName": "_Size",
|
||||
"m_OverrideReferenceName": "_DetailSize",
|
||||
"m_RefNameGeneratedByDisplayName": "SizeA",
|
||||
"m_DefaultReferenceName": "_SizeA",
|
||||
"m_OverrideReferenceName": "_DetailSizeA",
|
||||
"m_GeneratePropertyBlock": true,
|
||||
"m_UseCustomSlotLabel": false,
|
||||
"m_CustomSlotLabel": "",
|
||||
@@ -4130,8 +4407,8 @@
|
||||
"m_Expanded": true,
|
||||
"m_Position": {
|
||||
"serializedVersion": "2",
|
||||
"x": 575.0,
|
||||
"y": 1131.0,
|
||||
"x": 575.0000610351563,
|
||||
"y": 1226.0001220703125,
|
||||
"width": 125.0,
|
||||
"height": 34.0
|
||||
}
|
||||
@@ -4154,6 +4431,102 @@
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.PropertyNode",
|
||||
"m_ObjectId": "b5172e2b5c564e53a09c016c34c5fe74",
|
||||
"m_Group": {
|
||||
"m_Id": ""
|
||||
},
|
||||
"m_Name": "Property",
|
||||
"m_DrawState": {
|
||||
"m_Expanded": true,
|
||||
"m_Position": {
|
||||
"serializedVersion": "2",
|
||||
"x": 569.0000610351563,
|
||||
"y": 591.0,
|
||||
"width": 121.0,
|
||||
"height": 34.0
|
||||
}
|
||||
},
|
||||
"m_Slots": [
|
||||
{
|
||||
"m_Id": "a32af8e110204ce6ae39abc3018a9735"
|
||||
}
|
||||
],
|
||||
"synonyms": [],
|
||||
"m_Precision": 0,
|
||||
"m_PreviewExpanded": true,
|
||||
"m_DismissedVersion": 0,
|
||||
"m_PreviewMode": 0,
|
||||
"m_CustomColors": {
|
||||
"m_SerializableColors": []
|
||||
},
|
||||
"m_Property": {
|
||||
"m_Id": "4c76112170fd4b22b30eca3196ea7d9d"
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
|
||||
"m_ObjectId": "b69768e112904659b90002fc2c2048a0",
|
||||
"m_Id": 22,
|
||||
"m_DisplayName": "DetailIntensityA",
|
||||
"m_SlotType": 0,
|
||||
"m_Hidden": false,
|
||||
"m_ShaderOutputName": "DetailIntensityA",
|
||||
"m_StageCapability": 3,
|
||||
"m_Value": 0.0,
|
||||
"m_DefaultValue": 0.0,
|
||||
"m_Labels": [],
|
||||
"m_LiteralMode": false
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 1,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty",
|
||||
"m_ObjectId": "b895eb6f71ac4810a7fd92fac6d300bd",
|
||||
"m_Guid": {
|
||||
"m_GuidSerialized": "5f93d659-8a77-488e-a986-a0eea51d101e"
|
||||
},
|
||||
"promotedFromAssetID": "",
|
||||
"promotedFromCategoryName": "",
|
||||
"promotedOrdering": -1,
|
||||
"m_Name": "SizeB",
|
||||
"m_DefaultRefNameVersion": 1,
|
||||
"m_RefNameGeneratedByDisplayName": "SizeB",
|
||||
"m_DefaultReferenceName": "_SizeB",
|
||||
"m_OverrideReferenceName": "_DetailSizeB",
|
||||
"m_GeneratePropertyBlock": true,
|
||||
"m_UseCustomSlotLabel": false,
|
||||
"m_CustomSlotLabel": "",
|
||||
"m_DismissedVersion": 0,
|
||||
"m_Precision": 0,
|
||||
"overrideHLSLDeclaration": false,
|
||||
"hlslDeclarationOverride": 0,
|
||||
"m_Hidden": false,
|
||||
"m_PerRendererData": false,
|
||||
"m_customAttributes": [],
|
||||
"m_Value": 1.0,
|
||||
"m_FloatType": 0,
|
||||
"m_LiteralFloatMode": false,
|
||||
"m_RangeValues": {
|
||||
"x": 0.0,
|
||||
"y": 1.0
|
||||
},
|
||||
"m_SliderType": 0,
|
||||
"m_SliderPower": 3.0,
|
||||
"m_EnumType": 0,
|
||||
"m_CSharpEnumString": "",
|
||||
"m_EnumNames": [
|
||||
"Default"
|
||||
],
|
||||
"m_EnumValues": [
|
||||
0
|
||||
]
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
|
||||
@@ -4182,7 +4555,7 @@
|
||||
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
|
||||
"m_ObjectId": "bcdefe9f3c384f14874b4361894b61f9",
|
||||
"m_Id": 0,
|
||||
"m_DisplayName": "Size",
|
||||
"m_DisplayName": "SizeA",
|
||||
"m_SlotType": 1,
|
||||
"m_Hidden": false,
|
||||
"m_ShaderOutputName": "Out",
|
||||
@@ -4334,18 +4707,27 @@
|
||||
"m_Expanded": true,
|
||||
"m_Position": {
|
||||
"serializedVersion": "2",
|
||||
"x": 970.9999389648438,
|
||||
"x": 971.0,
|
||||
"y": 523.0,
|
||||
"width": 219.00006103515626,
|
||||
"height": 421.99993896484377
|
||||
"width": 219.0,
|
||||
"height": 614.0
|
||||
}
|
||||
},
|
||||
"m_Slots": [
|
||||
{
|
||||
"m_Id": "8ead54ba7a8d487ea3f55e930101215f"
|
||||
},
|
||||
{
|
||||
"m_Id": "47f83090b78a47a2915fa8ba5c1ca123"
|
||||
},
|
||||
{
|
||||
"m_Id": "a4ebf1b78b20490d9b1c3591e31e9f00"
|
||||
},
|
||||
{
|
||||
"m_Id": "ab55036f97c64fcc877002909d03e43f"
|
||||
"m_Id": "ff6c536b7e9945728e74c95b9150ffe4"
|
||||
},
|
||||
{
|
||||
"m_Id": "5aa83171d7bf4e83948c0de8922c5d7f"
|
||||
},
|
||||
{
|
||||
"m_Id": "5b149889e6574c49acaa3216871f187b"
|
||||
@@ -4360,7 +4742,16 @@
|
||||
"m_Id": "5ac79464834a403381144578be491825"
|
||||
},
|
||||
{
|
||||
"m_Id": "a34a1ccc27e94fc8890ea8c79a176430"
|
||||
"m_Id": "b69768e112904659b90002fc2c2048a0"
|
||||
},
|
||||
{
|
||||
"m_Id": "ab5e4947fae0436493254c5ab5f3a1c6"
|
||||
},
|
||||
{
|
||||
"m_Id": "e28d8b1dad164be6b961f768addbac10"
|
||||
},
|
||||
{
|
||||
"m_Id": "4961d3b3358f43cab81418dd63c325d2"
|
||||
},
|
||||
{
|
||||
"m_Id": "e233b7c79bac436fa1cd754c41001c8a"
|
||||
@@ -4373,12 +4764,6 @@
|
||||
},
|
||||
{
|
||||
"m_Id": "73aee6571bd544d291ec8f0ebd85114d"
|
||||
},
|
||||
{
|
||||
"m_Id": "8ead54ba7a8d487ea3f55e930101215f"
|
||||
},
|
||||
{
|
||||
"m_Id": "47f83090b78a47a2915fa8ba5c1ca123"
|
||||
}
|
||||
],
|
||||
"synonyms": [
|
||||
@@ -4522,6 +4907,50 @@
|
||||
"m_LiteralMode": false
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 1,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty",
|
||||
"m_ObjectId": "d8b68fd7729c41039dd3abc795440c55",
|
||||
"m_Guid": {
|
||||
"m_GuidSerialized": "aa7f2029-2aad-46ad-82d7-c62cdc5e106d"
|
||||
},
|
||||
"promotedFromAssetID": "",
|
||||
"promotedFromCategoryName": "",
|
||||
"promotedOrdering": -1,
|
||||
"m_Name": "IntensityA",
|
||||
"m_DefaultRefNameVersion": 1,
|
||||
"m_RefNameGeneratedByDisplayName": "IntensityA",
|
||||
"m_DefaultReferenceName": "_IntensityA",
|
||||
"m_OverrideReferenceName": "_DetailIntensityA",
|
||||
"m_GeneratePropertyBlock": true,
|
||||
"m_UseCustomSlotLabel": false,
|
||||
"m_CustomSlotLabel": "",
|
||||
"m_DismissedVersion": 0,
|
||||
"m_Precision": 0,
|
||||
"overrideHLSLDeclaration": false,
|
||||
"hlslDeclarationOverride": 0,
|
||||
"m_Hidden": false,
|
||||
"m_PerRendererData": false,
|
||||
"m_customAttributes": [],
|
||||
"m_Value": 0.30000001192092898,
|
||||
"m_FloatType": 1,
|
||||
"m_LiteralFloatMode": false,
|
||||
"m_RangeValues": {
|
||||
"x": 0.0,
|
||||
"y": 1.0
|
||||
},
|
||||
"m_SliderType": 0,
|
||||
"m_SliderPower": 3.0,
|
||||
"m_EnumType": 0,
|
||||
"m_CSharpEnumString": "",
|
||||
"m_EnumNames": [
|
||||
"Default"
|
||||
],
|
||||
"m_EnumValues": [
|
||||
0
|
||||
]
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
|
||||
@@ -4538,6 +4967,50 @@
|
||||
"m_LiteralMode": false
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 1,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty",
|
||||
"m_ObjectId": "d991dda24848414d81022ed33f3eb97c",
|
||||
"m_Guid": {
|
||||
"m_GuidSerialized": "2531241b-5436-4780-ab21-9a4a885ce772"
|
||||
},
|
||||
"promotedFromAssetID": "",
|
||||
"promotedFromCategoryName": "",
|
||||
"promotedOrdering": -1,
|
||||
"m_Name": "IntensityB",
|
||||
"m_DefaultRefNameVersion": 1,
|
||||
"m_RefNameGeneratedByDisplayName": "IntensityB",
|
||||
"m_DefaultReferenceName": "_IntensityB",
|
||||
"m_OverrideReferenceName": "_DetailIntensityB",
|
||||
"m_GeneratePropertyBlock": true,
|
||||
"m_UseCustomSlotLabel": false,
|
||||
"m_CustomSlotLabel": "",
|
||||
"m_DismissedVersion": 0,
|
||||
"m_Precision": 0,
|
||||
"overrideHLSLDeclaration": false,
|
||||
"hlslDeclarationOverride": 0,
|
||||
"m_Hidden": false,
|
||||
"m_PerRendererData": false,
|
||||
"m_customAttributes": [],
|
||||
"m_Value": 0.5,
|
||||
"m_FloatType": 1,
|
||||
"m_LiteralFloatMode": false,
|
||||
"m_RangeValues": {
|
||||
"x": 0.0,
|
||||
"y": 1.0
|
||||
},
|
||||
"m_SliderType": 0,
|
||||
"m_SliderPower": 3.0,
|
||||
"m_EnumType": 0,
|
||||
"m_CSharpEnumString": "",
|
||||
"m_EnumNames": [
|
||||
"Default"
|
||||
],
|
||||
"m_EnumValues": [
|
||||
0
|
||||
]
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.PropertyNode",
|
||||
@@ -4550,8 +5023,8 @@
|
||||
"m_Expanded": true,
|
||||
"m_Position": {
|
||||
"serializedVersion": "2",
|
||||
"x": 586.0,
|
||||
"y": 1165.0,
|
||||
"x": 586.0000610351563,
|
||||
"y": 1260.0001220703125,
|
||||
"width": 114.0,
|
||||
"height": 34.0
|
||||
}
|
||||
@@ -4751,6 +5224,22 @@
|
||||
"m_DefaultValue": false
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
|
||||
"m_ObjectId": "e28d8b1dad164be6b961f768addbac10",
|
||||
"m_Id": 14,
|
||||
"m_DisplayName": "DetailSizeA",
|
||||
"m_SlotType": 0,
|
||||
"m_Hidden": false,
|
||||
"m_ShaderOutputName": "DetailSizeA",
|
||||
"m_StageCapability": 3,
|
||||
"m_Value": 0.0,
|
||||
"m_DefaultValue": 0.0,
|
||||
"m_Labels": [],
|
||||
"m_LiteralMode": false
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
|
||||
@@ -5055,6 +5544,42 @@
|
||||
"m_Labels": []
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.PropertyNode",
|
||||
"m_ObjectId": "f3aecffeb464486d9e5ca19cd1f4bebc",
|
||||
"m_Group": {
|
||||
"m_Id": ""
|
||||
},
|
||||
"m_Name": "Property",
|
||||
"m_DrawState": {
|
||||
"m_Expanded": true,
|
||||
"m_Position": {
|
||||
"serializedVersion": "2",
|
||||
"x": 573.0000610351563,
|
||||
"y": 1058.0001220703125,
|
||||
"width": 127.0,
|
||||
"height": 34.0
|
||||
}
|
||||
},
|
||||
"m_Slots": [
|
||||
{
|
||||
"m_Id": "28dd5dc8acee4c7e83c3fda2e777b30f"
|
||||
}
|
||||
],
|
||||
"synonyms": [],
|
||||
"m_Precision": 0,
|
||||
"m_PreviewExpanded": true,
|
||||
"m_DismissedVersion": 0,
|
||||
"m_PreviewMode": 0,
|
||||
"m_CustomColors": {
|
||||
"m_SerializableColors": []
|
||||
},
|
||||
"m_Property": {
|
||||
"m_Id": "d8b68fd7729c41039dd3abc795440c55"
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
|
||||
@@ -5167,6 +5692,24 @@
|
||||
"m_Space": 0
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot",
|
||||
"m_ObjectId": "ff6c536b7e9945728e74c95b9150ffe4",
|
||||
"m_Id": 13,
|
||||
"m_DisplayName": "DetailTexA",
|
||||
"m_SlotType": 0,
|
||||
"m_Hidden": false,
|
||||
"m_ShaderOutputName": "DetailTexA",
|
||||
"m_StageCapability": 3,
|
||||
"m_BareResource": false,
|
||||
"m_Texture": {
|
||||
"m_SerializedTexture": "",
|
||||
"m_Guid": ""
|
||||
},
|
||||
"m_DefaultType": 0
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.CategoryData",
|
||||
|
||||
@@ -54,15 +54,15 @@ float GetShadow(float3 PositionWS)
|
||||
void GetDetailLOD
|
||||
(
|
||||
float Depth,
|
||||
float DetailSize,
|
||||
float DetailSizeA,
|
||||
float LODJitter,
|
||||
out float DetailSizeA,
|
||||
out float DetailSizeB,
|
||||
out float DetailSizeAA,
|
||||
out float DetailSizeAB,
|
||||
out float LODBlend
|
||||
)
|
||||
{
|
||||
const float lodRatio = 4;
|
||||
const float lodSize = DetailSize / lodRatio * 2;
|
||||
const float lodSize = DetailSizeA / lodRatio * 2;
|
||||
|
||||
float dist = max(Depth, 1e-5);
|
||||
float lod = log(dist) / log(lodRatio) + LODJitter; // log2(dist);
|
||||
@@ -72,8 +72,8 @@ void GetDetailLOD
|
||||
|
||||
LODBlend = lodFrac * lodFrac * (3 - 2 * lodFrac);
|
||||
|
||||
DetailSizeA = lodSize * pow(lodRatio, lodFloor);
|
||||
DetailSizeB = lodSize * pow(lodRatio, lodFloor + 1);
|
||||
DetailSizeAA = lodSize * pow(lodRatio, lodFloor);
|
||||
DetailSizeAB = lodSize * pow(lodRatio, lodFloor + 1);
|
||||
}
|
||||
|
||||
float4 SampleBombedTexture
|
||||
@@ -201,7 +201,7 @@ float4 SampleProjectedDetailLOD
|
||||
float3 PositionOS,
|
||||
float3 NormalOS,
|
||||
float ProjectionBlend,
|
||||
float DetailSize,
|
||||
float DetailSizeA,
|
||||
float Depth
|
||||
)
|
||||
{
|
||||
@@ -225,30 +225,30 @@ float4 SampleProjectedDetailLOD
|
||||
|
||||
float lodJitter = (Hash1From2D(floor(projections.uv[i] * lodJitterSize) + i * 17.13) - .5) * lodJitterStrength;
|
||||
|
||||
float detailSizeA;
|
||||
float detailSizeB;
|
||||
float DetailSizeAA;
|
||||
float DetailSizeAB;
|
||||
float lodBlend;
|
||||
|
||||
GetDetailLOD
|
||||
(
|
||||
Depth,
|
||||
DetailSize,
|
||||
DetailSizeA,
|
||||
lodJitter,
|
||||
detailSizeA,
|
||||
detailSizeB,
|
||||
DetailSizeAA,
|
||||
DetailSizeAB,
|
||||
lodBlend
|
||||
);
|
||||
|
||||
float4 detailA = SampleBombedTexture
|
||||
(
|
||||
DetailTex,
|
||||
projections.uv[i] / detailSizeA
|
||||
projections.uv[i] / DetailSizeAA
|
||||
);
|
||||
|
||||
float4 detailB = SampleBombedTexture
|
||||
(
|
||||
DetailTex,
|
||||
projections.uv[i] / detailSizeB
|
||||
projections.uv[i] / DetailSizeAB
|
||||
);
|
||||
|
||||
detail += lerp(detailA, detailB, lodBlend) * mask;
|
||||
@@ -261,12 +261,16 @@ float4 SampleProjectedDetailLOD
|
||||
void EnkiBillal_float
|
||||
(
|
||||
float4 Color,
|
||||
UnityTexture2D DetailTex,
|
||||
UnityTexture2D DetailTexA,
|
||||
UnityTexture2D DetailTexB,
|
||||
float2 ScreenUV,
|
||||
float3 PositionWS,
|
||||
float3 NormalWS,
|
||||
float ProjectionsBlend,
|
||||
float DetailSize,
|
||||
float DetailIntensityA,
|
||||
float DetailIntensityB,
|
||||
float DetailSizeA,
|
||||
float DetailSizeB,
|
||||
uint FogUse,
|
||||
float4 FogColor,
|
||||
float FogMin,
|
||||
@@ -294,25 +298,38 @@ void EnkiBillal_float
|
||||
|
||||
// Detail
|
||||
|
||||
float4 detail = SampleProjectedDetailLOD
|
||||
float4 detailA = SampleProjectedDetailLOD
|
||||
(
|
||||
DetailTex,
|
||||
DetailTexA,
|
||||
positionOS,
|
||||
normalOS,
|
||||
ProjectionsBlend,
|
||||
DetailSize,
|
||||
DetailSizeA,
|
||||
depth
|
||||
|
||||
);
|
||||
|
||||
float detailMask = smoothstep(0, .8, detail.a);
|
||||
float4 detailB = SampleProjectedDetailLOD
|
||||
(
|
||||
DetailTexB,
|
||||
positionOS,
|
||||
normalOS,
|
||||
ProjectionsBlend,
|
||||
DetailSizeB,
|
||||
depth
|
||||
|
||||
);
|
||||
|
||||
float detailMaskA = smoothstep(0, .8, detailA.a);
|
||||
float detailMaskB = smoothstep(0, .8, detailB.a);
|
||||
|
||||
// Fog
|
||||
|
||||
// Output
|
||||
|
||||
Output = Color.rgb;
|
||||
Output = lerp(Output.rgb, detail.rgb, detailMask);
|
||||
Output = lerp(Output.rgb, detailA.rgb, detailMaskA * DetailIntensityA);
|
||||
Output = lerp(Output.rgb, detailB.rgb, detailMaskB * DetailIntensityB);
|
||||
|
||||
if (FogUse)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user