diff --git a/Assets/_Content/Materials/M_default.mat b/Assets/_Content/Materials/M_default.mat index f3db3d80..416915d2 100644 --- a/Assets/_Content/Materials/M_default.mat +++ b/Assets/_Content/Materials/M_default.mat @@ -94,10 +94,12 @@ Material: - _Surface: 0 - _Test: 0 - _TriplanarBlend: 0.8 + - _UseVertexColor: 1 + - _VertexColor: 1 - _XRMotionVectorsPass: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _BaseColor: {r: 0.754717, g: 0.754717, b: 0.754717, a: 1} - _Color: {r: 0.8588235, g: 0.8588235, b: 0.8588235, a: 1} - _GrainColor: {r: 1, g: 1, b: 1, a: 0.09803922} - _HighlightColor: {r: 2.118547, g: 2.118547, b: 2.118547, a: 1} diff --git a/Assets/_Content/Materials/Stencil/M_default_mask_A.mat b/Assets/_Content/Materials/Stencil/M_default_mask_A.mat index 5a7e5f8b..fc0f4519 100644 --- a/Assets/_Content/Materials/Stencil/M_default_mask_A.mat +++ b/Assets/_Content/Materials/Stencil/M_default_mask_A.mat @@ -37,6 +37,14 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -71,7 +79,10 @@ Material: - _StrokeWidth: 0.324 - _Test: 0 - _TriplanarBlend: 0.8 + - _UseVertexColor: 1 + - _VertexColor: 1 m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 0.8588235, g: 0.8588235, b: 0.8588235, a: 1} - _GrainColor: {r: 1, g: 1, b: 1, a: 0.09803922} - _HighlightColor: {r: 2.118547, g: 2.118547, b: 2.118547, a: 1} diff --git a/Assets/_Content/Materials/Stencil/M_default_mask_B.mat b/Assets/_Content/Materials/Stencil/M_default_mask_B.mat index b1ea5895..1ef371f2 100644 --- a/Assets/_Content/Materials/Stencil/M_default_mask_B.mat +++ b/Assets/_Content/Materials/Stencil/M_default_mask_B.mat @@ -37,6 +37,14 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -72,7 +80,9 @@ Material: - _StrokeWidth: 0.324 - _Test: 0 - _TriplanarBlend: 0.8 + - _VertexColor: 1 m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 0.8588235, g: 0.8588235, b: 0.8588235, a: 1} - _GrainColor: {r: 1, g: 1, b: 1, a: 0.09803922} - _HighlightColor: {r: 2.118547, g: 2.118547, b: 2.118547, a: 1} diff --git a/Assets/_Content/Models/Environments/Theatre/Materials/M_Theatre_stainedGlass.mat b/Assets/_Content/Models/Environments/Theatre/Materials/M_Theatre_stainedGlass.mat index 2b8faf26..99a38846 100644 --- a/Assets/_Content/Models/Environments/Theatre/Materials/M_Theatre_stainedGlass.mat +++ b/Assets/_Content/Models/Environments/Theatre/Materials/M_Theatre_stainedGlass.mat @@ -37,6 +37,14 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -71,7 +79,9 @@ Material: - _StrokeWidth: 0.324 - _Test: 0 - _TriplanarBlend: 0.8 + - _UseVertexColor: 0 m_Colors: + - _BaseColor: {r: 1.1320753, g: 14.155458, b: 16, a: 1} - _Color: {r: 4.7767663, g: 5.928666, b: 5.992157, a: 1} - _GrainColor: {r: 1, g: 1, b: 1, a: 0.09803922} - _HighlightColor: {r: 2.118547, g: 2.118547, b: 2.118547, a: 1} diff --git a/Assets/_Content/Shaders/EnkiBillal/EnkiBiIlal.shadergraph b/Assets/_Content/Shaders/EnkiBillal/EnkiBiIlal.shadergraph index 686d3c49..3e694070 100644 --- a/Assets/_Content/Shaders/EnkiBillal/EnkiBiIlal.shadergraph +++ b/Assets/_Content/Shaders/EnkiBillal/EnkiBiIlal.shadergraph @@ -62,6 +62,15 @@ }, { "m_Id": "580816413399433c8c16f0400b09a694" + }, + { + "m_Id": "26343172620c46c781f6cb90d0ff532a" + }, + { + "m_Id": "1350e6c57b6f46b997c40d61c8565b35" + }, + { + "m_Id": "d4a07777651a4e19946ff77f26921f5f" } ], "m_Keywords": [], @@ -185,6 +194,27 @@ }, { "m_Id": "7f46f183954348bdbcb2254cce45ace0" + }, + { + "m_Id": "11cc8d02aa8e42dea441b13b34c95991" + }, + { + "m_Id": "dd4b2f0aedce4a238a8d9b4d3725565d" + }, + { + "m_Id": "854880d8657643659ab8282fbbce409c" + }, + { + "m_Id": "e8cc269134fb43dd99e1e5cb49b66005" + }, + { + "m_Id": "66abdeb4945d46df8937c754fb513d98" + }, + { + "m_Id": "a36705899cc54d65b390a8e2a9c876a0" + }, + { + "m_Id": "aed770d7b8364459a7bfdfc34cbd2ab8" } ], "m_GroupDatas": [], @@ -204,6 +234,20 @@ "m_SlotId": 9 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "11cc8d02aa8e42dea441b13b34c95991" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "dd4b2f0aedce4a238a8d9b4d3725565d" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -213,9 +257,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "ab831e5eb1414dd1b6ef8741cb57175b" + "m_Id": "854880d8657643659ab8282fbbce409c" }, - "m_SlotId": 0 + "m_SlotId": 1 } }, { @@ -302,6 +346,20 @@ "m_SlotId": 10 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "66abdeb4945d46df8937c754fb513d98" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "e8cc269134fb43dd99e1e5cb49b66005" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -313,7 +371,7 @@ "m_Node": { "m_Id": "ab831e5eb1414dd1b6ef8741cb57175b" }, - "m_SlotId": 1 + "m_SlotId": 0 } }, { @@ -344,6 +402,34 @@ "m_SlotId": 17 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "854880d8657643659ab8282fbbce409c" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "ab831e5eb1414dd1b6ef8741cb57175b" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "854880d8657643659ab8282fbbce409c" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "e8cc269134fb43dd99e1e5cb49b66005" + }, + "m_SlotId": 2 + } + }, { "m_OutputSlot": { "m_Node": { @@ -372,6 +458,20 @@ "m_SlotId": 6 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "a36705899cc54d65b390a8e2a9c876a0" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "aed770d7b8364459a7bfdfc34cbd2ab8" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -395,9 +495,23 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "c5d342277052409f87283f2c60ccf3a1" + "m_Id": "e8cc269134fb43dd99e1e5cb49b66005" }, - "m_SlotId": 4 + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "aed770d7b8364459a7bfdfc34cbd2ab8" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "e042671f7f804efca0130f700c1e3e50" + }, + "m_SlotId": 0 } }, { @@ -442,6 +556,34 @@ "m_SlotId": 3 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "dd4b2f0aedce4a238a8d9b4d3725565d" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "854880d8657643659ab8282fbbce409c" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "e8cc269134fb43dd99e1e5cb49b66005" + }, + "m_SlotId": 3 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "c5d342277052409f87283f2c60ccf3a1" + }, + "m_SlotId": 4 + } + }, { "m_OutputSlot": { "m_Node": { @@ -555,7 +697,7 @@ "m_DefaultRefNameVersion": 1, "m_RefNameGeneratedByDisplayName": "Color", "m_DefaultReferenceName": "_Color", - "m_OverrideReferenceName": "", + "m_OverrideReferenceName": "_BaseColor", "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", @@ -567,9 +709,9 @@ "m_PerRendererData": false, "m_customAttributes": [], "m_Value": { - "r": 0.8588235378265381, - "g": 0.8588235378265381, - "b": 0.8588235378265381, + "r": 1.0, + "g": 1.0, + "b": 1.0, "a": 1.0 }, "isMainColor": false, @@ -678,6 +820,22 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "0408f8461d684f7bafec5ee6454aa7f7", + "m_Id": 4, + "m_DisplayName": "R", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "R", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -753,6 +911,58 @@ "m_SerializedDescriptor": "SurfaceDescription.Alpha" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "10b93f68e9e9423983ba5eb28c0bc7b1", + "m_Id": 4, + "m_DisplayName": "R", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "R", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "11cc8d02aa8e42dea441b13b34c95991", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -324.0, + "y": 239.0, + "width": 121.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "e221a62415ea408195d5db12b0772cb6" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "26343172620c46c781f6cb90d0ff532a" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", @@ -776,6 +986,50 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "12e66d5def074e28a534edd606e1e972", + "m_Id": 5, + "m_DisplayName": "G", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "G", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Internal.BooleanShaderProperty", + "m_ObjectId": "1350e6c57b6f46b997c40d61c8565b35", + "m_Guid": { + "m_GuidSerialized": "6d94c0e1-56ec-440c-9375-6a8f59d6f159" + }, + "promotedFromAssetID": "", + "promotedFromCategoryName": "", + "promotedOrdering": -1, + "m_Name": "VertexColor", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "VertexColor", + "m_DefaultReferenceName": "_VertexColor", + "m_OverrideReferenceName": "", + "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": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.CategoryData", @@ -806,8 +1060,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 519.0, - "y": 173.0, + "x": -93.0, + "y": 324.0, "width": 105.0, "height": 34.0 } @@ -836,8 +1090,17 @@ "m_ObjectId": "1810970db54d423b8e943f22d93dff81", "m_Name": "Global", "m_ChildObjectList": [ + { + "m_Id": "1350e6c57b6f46b997c40d61c8565b35" + }, { "m_Id": "00de379b90744d5496dbbab532d54c41" + }, + { + "m_Id": "26343172620c46c781f6cb90d0ff532a" + }, + { + "m_Id": "d4a07777651a4e19946ff77f26921f5f" } ] } @@ -894,6 +1157,28 @@ "m_SerializedDescriptor": "VertexDescription.Position" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", + "m_ObjectId": "1d063a489a0a4e10af3efd2f8efa178e", + "m_Id": 2, + "m_DisplayName": "UV", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "UV", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [], + "m_Channel": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -930,6 +1215,22 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "1fa39e0c3c354522bfaf4d31799c1b0a", + "m_Id": 6, + "m_DisplayName": "B", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", @@ -994,6 +1295,42 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", + "m_ObjectId": "26343172620c46c781f6cb90d0ff532a", + "m_Guid": { + "m_GuidSerialized": "caf586c7-b1ea-47a2-be9d-109c338a78ad" + }, + "promotedFromAssetID": "", + "promotedFromCategoryName": "", + "promotedOrdering": -1, + "m_Name": "Albedo", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Albedo", + "m_DefaultReferenceName": "_Albedo", + "m_OverrideReferenceName": "_BaseMap", + "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": "", + "m_Guid": "" + }, + "isMainTexture": false, + "useTilingAndOffset": true, + "useTexelSize": true, + "m_Modifiable": true, + "m_DefaultType": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -1010,6 +1347,24 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "2be00d9c8bdb4a94a3a1a37a2f6aa06f", + "m_Id": 1, + "m_DisplayName": "Texture", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Texture", + "m_StageCapability": 3, + "m_BareResource": false, + "m_Texture": { + "m_SerializedTexture": "", + "m_Guid": "" + }, + "m_DefaultType": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", @@ -1114,13 +1469,13 @@ "m_RefNameGeneratedByDisplayName": "StrokeHardness", "m_DefaultReferenceName": "_StrokeHardness", "m_OverrideReferenceName": "", - "m_GeneratePropertyBlock": true, + "m_GeneratePropertyBlock": false, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", "m_DismissedVersion": 0, "m_Precision": 0, - "overrideHLSLDeclaration": false, - "hlslDeclarationOverride": 0, + "overrideHLSLDeclaration": true, + "hlslDeclarationOverride": 2, "m_Hidden": false, "m_PerRendererData": false, "m_customAttributes": [], @@ -1191,6 +1546,28 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", + "m_ObjectId": "3dcd6e312d6c4dd182f8023dfd248c81", + "m_Id": 2, + "m_DisplayName": "UV", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "UV", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [], + "m_Channel": 0 +} + { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.PositionNode", @@ -1508,6 +1885,19 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", + "m_ObjectId": "4b34959b3cf0444783aaad483355f741", + "m_Id": 3, + "m_DisplayName": "Sampler", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Sampler", + "m_StageCapability": 3, + "m_BareResource": false +} + { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", @@ -1678,6 +2068,70 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "540cd010c5994bdd820df501a9794346", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 2.0, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "54198f7d4d004a83bf53b0b906447c65", + "m_Id": 6, + "m_DisplayName": "B", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", @@ -2026,6 +2480,42 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "66abdeb4945d46df8937c754fb513d98", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 201.0, + "y": 90.0, + "width": 159.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "87fe166e94ba4efc8795b3e169e213e8" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "1350e6c57b6f46b997c40d61c8565b35" + } +} + { "m_SGVersion": 3, "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", @@ -2084,6 +2574,31 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "6d822a70ff8f4345a5d22e6d23cc4120", + "m_Id": 0, + "m_DisplayName": "RGBA", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "RGBA", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -2112,10 +2627,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 499.0, - "y": 221.0, + "x": 72.00001525878906, + "y": 90.0000228881836, "width": 117.0, - "height": 94.0 + "height": 93.99999237060547 } }, "m_Slots": [ @@ -2133,6 +2648,20 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot", + "m_ObjectId": "71d707e0a14c4a1ea88bc006fa6b0861", + "m_Id": 0, + "m_DisplayName": "Predicate", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Predicate", + "m_StageCapability": 3, + "m_Value": false, + "m_DefaultValue": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -2241,6 +2770,49 @@ "m_Space": 3 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "7d7ef75e76de4b08b560e8ed2485681c", + "m_Id": 3, + "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_LiteralMode": true +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "7e494af52fef486c9277f7560f63f2c9", + "m_Id": 1, + "m_DisplayName": "Texture", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Texture", + "m_StageCapability": 3, + "m_BareResource": false, + "m_Texture": { + "m_SerializedTexture": "", + "m_Guid": "" + }, + "m_DefaultType": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -2350,6 +2922,31 @@ "m_SerializedDescriptor": "SurfaceDescription.Emission" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "8406d1bd75fc4faa9fa24f516ea4d4a1", + "m_Id": 2, + "m_DisplayName": "False", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "False", + "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_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", @@ -2380,6 +2977,63 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "854880d8657643659ab8282fbbce409c", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 56.00000762939453, + "y": 206.00001525878907, + "width": 130.0, + "height": 118.00001525878906 + } + }, + "m_Slots": [ + { + "m_Id": "c5749b986f0b4439810a667b120a6f1a" + }, + { + "m_Id": "540cd010c5994bdd820df501a9794346" + }, + { + "m_Id": "caf49ceeebd54224b56c29ebecb19871" + } + ], + "synonyms": [ + "multiplication", + "times", + "x" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot", + "m_ObjectId": "87fe166e94ba4efc8795b3e169e213e8", + "m_Id": 0, + "m_DisplayName": "UseVertexColor", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": false, + "m_DefaultValue": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -2718,13 +3372,13 @@ "m_RefNameGeneratedByDisplayName": "StrokeWidth", "m_DefaultReferenceName": "_StrokeWidth", "m_OverrideReferenceName": "", - "m_GeneratePropertyBlock": true, + "m_GeneratePropertyBlock": false, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", "m_DismissedVersion": 0, "m_Precision": 0, - "overrideHLSLDeclaration": false, - "hlslDeclarationOverride": 0, + "overrideHLSLDeclaration": true, + "hlslDeclarationOverride": 2, "m_Hidden": false, "m_PerRendererData": false, "m_customAttributes": [], @@ -2794,6 +3448,22 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "98aba0c21b0c42f1af6a4e7b2858b276", + "m_Id": 5, + "m_DisplayName": "G", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "G", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.ScreenPositionNode", @@ -2917,6 +3587,35 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", + "m_ObjectId": "9f0c0eb836db4d02a22944f1aae771d5", + "m_Id": 3, + "m_DisplayName": "Sampler", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Sampler", + "m_StageCapability": 3, + "m_BareResource": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "9f7aa080a78642f992c214a4887b4521", + "m_Id": 7, + "m_DisplayName": "A", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Matrix4MaterialSlot", @@ -2965,6 +3664,42 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "a36705899cc54d65b390a8e2a9c876a0", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 677.0000610351563, + "y": 148.0, + "width": 121.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "c5c992c3824f4932b22e207c439922b4" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "d4a07777651a4e19946ff77f26921f5f" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", @@ -2990,6 +3725,31 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "a6f0e161084f494a927a70ba8ffa3106", + "m_Id": 1, + "m_DisplayName": "True", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "True", + "m_StageCapability": 3, + "m_Value": { + "x": 1.0, + "y": 1.0, + "z": 1.0, + "w": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -3038,8 +3798,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 640.0, - "y": 167.0, + "x": 230.00003051757813, + "y": 138.00003051757813, "width": 130.0, "height": 118.0 } @@ -3069,6 +3829,66 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode", + "m_ObjectId": "aed770d7b8364459a7bfdfc34cbd2ab8", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Sample Texture 2D", + "m_DrawState": { + "m_Expanded": false, + "m_Position": { + "serializedVersion": "2", + "x": 826.0000610351563, + "y": 108.0, + "width": 179.00006103515626, + "height": 153.0 + } + }, + "m_Slots": [ + { + "m_Id": "f0d8ff6cdfd2463a8f7a5f79a6290cfe" + }, + { + "m_Id": "10b93f68e9e9423983ba5eb28c0bc7b1" + }, + { + "m_Id": "12e66d5def074e28a534edd606e1e972" + }, + { + "m_Id": "1fa39e0c3c354522bfaf4d31799c1b0a" + }, + { + "m_Id": "d97fdf9b907640af93af26dd578484e9" + }, + { + "m_Id": "7e494af52fef486c9277f7560f63f2c9" + }, + { + "m_Id": "3dcd6e312d6c4dd182f8023dfd248c81" + }, + { + "m_Id": "9f0c0eb836db4d02a22944f1aae771d5" + } + ], + "synonyms": [ + "tex2d" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_TextureType": 1, + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true, + "m_MipSamplingMode": 0 +} + { "m_SGVersion": 2, "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalLitSubTarget", @@ -3170,6 +3990,67 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "c5749b986f0b4439810a667b120a6f1a", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", + "m_ObjectId": "c5c992c3824f4932b22e207c439922b4", + "m_Id": 0, + "m_DisplayName": "Normal", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_BareResource": false +} + { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.CustomFunctionNode", @@ -3364,6 +4245,54 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "caf49ceeebd54224b56c29ebecb19871", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", @@ -3452,6 +4381,42 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", + "m_ObjectId": "d4a07777651a4e19946ff77f26921f5f", + "m_Guid": { + "m_GuidSerialized": "6a38a2ef-ff71-4573-a9ac-f2359bf739a5" + }, + "promotedFromAssetID": "", + "promotedFromCategoryName": "", + "promotedOrdering": -1, + "m_Name": "Normal", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Normal", + "m_DefaultReferenceName": "_Normal", + "m_OverrideReferenceName": "_BumpMap", + "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": "", + "m_Guid": "" + }, + "isMainTexture": false, + "useTilingAndOffset": true, + "useTexelSize": true, + "m_Modifiable": true, + "m_DefaultType": 3 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -3520,6 +4485,22 @@ "m_Space": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "d97fdf9b907640af93af26dd578484e9", + "m_Id": 7, + "m_DisplayName": "A", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -3536,6 +4517,66 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode", + "m_ObjectId": "dd4b2f0aedce4a238a8d9b4d3725565d", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Sample Texture 2D", + "m_DrawState": { + "m_Expanded": false, + "m_Position": { + "serializedVersion": "2", + "x": -167.0, + "y": 155.00001525878907, + "width": 179.00001525878907, + "height": 152.99998474121095 + } + }, + "m_Slots": [ + { + "m_Id": "6d822a70ff8f4345a5d22e6d23cc4120" + }, + { + "m_Id": "0408f8461d684f7bafec5ee6454aa7f7" + }, + { + "m_Id": "98aba0c21b0c42f1af6a4e7b2858b276" + }, + { + "m_Id": "54198f7d4d004a83bf53b0b906447c65" + }, + { + "m_Id": "9f7aa080a78642f992c214a4887b4521" + }, + { + "m_Id": "2be00d9c8bdb4a94a3a1a37a2f6aa06f" + }, + { + "m_Id": "1d063a489a0a4e10af3efd2f8efa178e" + }, + { + "m_Id": "4b34959b3cf0444783aaad483355f741" + } + ], + "synonyms": [ + "tex2d" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_TextureType": 0, + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true, + "m_MipSamplingMode": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", @@ -3610,6 +4651,19 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", + "m_ObjectId": "e221a62415ea408195d5db12b0772cb6", + "m_Id": 0, + "m_DisplayName": "Albedo", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_BareResource": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", @@ -3701,6 +4755,52 @@ "m_SerializedDescriptor": "SurfaceDescription.Smoothness" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BranchNode", + "m_ObjectId": "e8cc269134fb43dd99e1e5cb49b66005", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Branch", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 441.0000305175781, + "y": 159.00001525878907, + "width": 172.00003051757813, + "height": 142.00001525878907 + } + }, + "m_Slots": [ + { + "m_Id": "71d707e0a14c4a1ea88bc006fa6b0861" + }, + { + "m_Id": "a6f0e161084f494a927a70ba8ffa3106" + }, + { + "m_Id": "8406d1bd75fc4faa9fa24f516ea4d4a1" + }, + { + "m_Id": "7d7ef75e76de4b08b560e8ed2485681c" + } + ], + "synonyms": [ + "switch", + "if", + "else" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.NormalVectorNode", @@ -3782,6 +4882,31 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "f0d8ff6cdfd2463a8f7a5f79a6290cfe", + "m_Id": 0, + "m_DisplayName": "RGBA", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "RGBA", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", @@ -3859,13 +4984,13 @@ "m_RefNameGeneratedByDisplayName": "StrokeDensity", "m_DefaultReferenceName": "_StrokeDensity", "m_OverrideReferenceName": "", - "m_GeneratePropertyBlock": true, + "m_GeneratePropertyBlock": false, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", "m_DismissedVersion": 0, "m_Precision": 0, - "overrideHLSLDeclaration": false, - "hlslDeclarationOverride": 0, + "overrideHLSLDeclaration": true, + "hlslDeclarationOverride": 2, "m_Hidden": false, "m_PerRendererData": false, "m_customAttributes": [],