diff --git a/Assets/Materials/AuctionHall/AuctionToon.mat b/Assets/Materials/AuctionHall/AuctionToon.mat index 31f74f317..aaee0f7c4 100644 --- a/Assets/Materials/AuctionHall/AuctionToon.mat +++ b/Assets/Materials/AuctionHall/AuctionToon.mat @@ -131,7 +131,7 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _SHADOWS_SOFT: 1 - - _Shadow_Texture: 0 + - _Shadow_Texture: 1 - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 diff --git a/Assets/Materials/AuctionHall/Cloth.mat b/Assets/Materials/AuctionHall/Cloth.mat new file mode 100644 index 000000000..937b7beb8 --- /dev/null +++ b/Assets/Materials/AuctionHall/Cloth.mat @@ -0,0 +1,160 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-6200280157711665500 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Cloth + m_Shader: {fileID: -6465566751694194690, guid: f8ec4cafbe9538b4aa600770a5a8bf02, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - MAIN_LIGHT_CALCULATE_SHADOWS + - _MAIN_LIGHT_SHADOWS_CASCADE + - _SHADOWS_SOFT + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + 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} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Metallic_Texture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Normal_Map: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Texture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Triplanar_8082379ce2a14f38b8de533a506ee294_Texture_1: + m_Texture: {fileID: 2800000, guid: 5ef5d25785740444ab670640848feec7, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - MAIN_LIGHT_CALCULATE_SHADOWS: 1 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _MAIN_LIGHT_SHADOWS_CASCADE: 1 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SHADOWS_SOFT: 1 + - _Shadow_Texture: 0 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _Texture_Intensity: 1 + - _Use_Normal_Map: 0 + - _Use_Specular: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + - _Texture_Tiling: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/AuctionHall/Cloth.mat.meta b/Assets/Materials/AuctionHall/Cloth.mat.meta new file mode 100644 index 000000000..0f2f83311 --- /dev/null +++ b/Assets/Materials/AuctionHall/Cloth.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f434558a06361e24bb60b196c0c41164 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/AuctionHall/Curtains.mat b/Assets/Materials/AuctionHall/Curtains.mat index cff4d8a96..8a75d4318 100644 --- a/Assets/Materials/AuctionHall/Curtains.mat +++ b/Assets/Materials/AuctionHall/Curtains.mat @@ -131,14 +131,14 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _SHADOWS_SOFT: 1 - - _Shadow_Texture: 0 + - _Shadow_Texture: 1 - _Smoothness: 2 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 0 - - _Texture_Intensity: 1 + - _Texture_Intensity: 0.27 - _UVSec: 0 - _Use_Normal_Map: 1 - _Use_Specular: 0 diff --git a/Assets/Materials/AuctionHall/Table.mat b/Assets/Materials/AuctionHall/Table.mat index a21f49c84..2b3dc1bdb 100644 --- a/Assets/Materials/AuctionHall/Table.mat +++ b/Assets/Materials/AuctionHall/Table.mat @@ -131,7 +131,7 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _SHADOWS_SOFT: 1 - - _Shadow_Texture: 0 + - _Shadow_Texture: 1 - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 diff --git a/Assets/Scenes/Bidding.unity b/Assets/Scenes/Bidding.unity index 5fa55b1a6..dad5795d0 100644 --- a/Assets/Scenes/Bidding.unity +++ b/Assets/Scenes/Bidding.unity @@ -758,7 +758,7 @@ Light: m_Type: 2 m_Resolution: -1 m_CustomResolution: -1 - m_Strength: 0.6 + m_Strength: 1 m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 @@ -836,7 +836,7 @@ MonoBehaviour: m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} - m_SoftShadowQuality: 1 + m_SoftShadowQuality: 0 --- !u!1001 &247741865 PrefabInstance: m_ObjectHideFlags: 0 @@ -4484,7 +4484,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: -5500058390596650592, guid: 4d0deece7ece00c4895f41aaca16bc26, type: 3} + - {fileID: 2100000, guid: f434558a06361e24bb60b196c0c41164, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Scenes/CraterTown.unity b/Assets/Scenes/CraterTown.unity index 5d671ecd0..00410e381 100644 --- a/Assets/Scenes/CraterTown.unity +++ b/Assets/Scenes/CraterTown.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 662445327} - m_IndirectSpecularColor: {r: 0.038899824, g: 0.20187959, b: 0.48861444, a: 1} + m_IndirectSpecularColor: {r: 0.064907745, g: 0.22112818, b: 0.49562854, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -3248,7 +3248,7 @@ Light: m_Type: 2 m_Resolution: -1 m_CustomResolution: -1 - m_Strength: 0.6 + m_Strength: 1 m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 diff --git a/Assets/Settings/URP_Asset.asset b/Assets/Settings/URP_Asset.asset index f9ed1fb8b..2d85a037d 100644 --- a/Assets/Settings/URP_Asset.asset +++ b/Assets/Settings/URP_Asset.asset @@ -46,13 +46,13 @@ MonoBehaviour: m_ReflectionProbeBlending: 0 m_ReflectionProbeBoxProjection: 0 m_ShadowDistance: 99 - m_ShadowCascadeCount: 4 - m_Cascade2Split: 0.12 + m_ShadowCascadeCount: 2 + m_Cascade2Split: 0.20217243 m_Cascade3Split: {x: 0.1, y: 0.3} m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467} m_CascadeBorder: 0 m_ShadowDepthBias: 1.1 - m_ShadowNormalBias: 1 + m_ShadowNormalBias: 0.16 m_AnyShadowsSupported: 1 m_SoftShadowsSupported: 1 m_ConservativeEnclosingSphere: 1 diff --git a/Assets/Shaders/ToonSubgraph.shadersubgraph b/Assets/Shaders/ToonSubgraph.shadersubgraph index 2fe0acdc5..dc00e9ce9 100644 --- a/Assets/Shaders/ToonSubgraph.shadersubgraph +++ b/Assets/Shaders/ToonSubgraph.shadersubgraph @@ -163,9 +163,6 @@ { "m_Id": "6856e5df7bb443758e52e0dc09aed27b" }, - { - "m_Id": "8cb292a1d0d548c28a671e2cf095cc70" - }, { "m_Id": "f414734bb1d845cea1f41e50d18ef1e2" }, @@ -255,6 +252,12 @@ }, { "m_Id": "33ce5f44a769479c9df44fe5e536be4d" + }, + { + "m_Id": "0b7736f093af438e98bf6a30614ee718" + }, + { + "m_Id": "100efcb0a6fc47d29af864b62b6321a4" } ], "m_GroupDatas": [ @@ -325,6 +328,34 @@ "m_SlotId": 1 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "0b7736f093af438e98bf6a30614ee718" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "1fa6b17dc8514de8b215b83c037d7d35" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "0b7736f093af438e98bf6a30614ee718" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "e17ef440c7074394834cc3f7a6ba761c" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -381,6 +412,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "100efcb0a6fc47d29af864b62b6321a4" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "0b7736f093af438e98bf6a30614ee718" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -502,21 +547,7 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "1fa6b17dc8514de8b215b83c037d7d35" - }, - "m_SlotId": 1 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "29541b453cf84e2a892df6e719bc9dfb" - }, - "m_SlotId": 2 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "e17ef440c7074394834cc3f7a6ba761c" + "m_Id": "0b7736f093af438e98bf6a30614ee718" }, "m_SlotId": 1 } @@ -754,9 +785,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "8cb292a1d0d548c28a671e2cf095cc70" + "m_Id": "0d3d5cf0055448d1919d085759df5021" }, - "m_SlotId": 1 + "m_SlotId": 0 } }, { @@ -871,20 +902,6 @@ "m_SlotId": 0 } }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "8cb292a1d0d548c28a671e2cf095cc70" - }, - "m_SlotId": 2 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "0d3d5cf0055448d1919d085759df5021" - }, - "m_SlotId": 0 - } - }, { "m_OutputSlot": { "m_Node": { @@ -927,20 +944,6 @@ "m_SlotId": 1 } }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "aff80e6327784a868be7c56b9c6c5036" - }, - "m_SlotId": 2 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "8cb292a1d0d548c28a671e2cf095cc70" - }, - "m_SlotId": 0 - } - }, { "m_OutputSlot": { "m_Node": { @@ -1067,6 +1070,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "d209e3e8c6fc4cfdaa688581d4e6e540" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "100efcb0a6fc47d29af864b62b6321a4" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -1530,54 +1547,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "07e5855843ca4a3197a0aea92bcbe292", - "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": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -1602,6 +1571,49 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "0b7736f093af438e98bf6a30614ee718", + "m_Group": { + "m_Id": "1c0a6f775de64259b7b14e8983abcdc7" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 1892.0, + "y": 318.0000305175781, + "width": 126.0, + "height": 118.0 + } + }, + "m_Slots": [ + { + "m_Id": "5dd2fc3cbb7844b6a748badc7111df7b" + }, + { + "m_Id": "8e19624f54b34a359a8b7d7d52ebadb6" + }, + { + "m_Id": "e1e303df869c4e89a7480a7d25676660" + } + ], + "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.DistanceNode", @@ -1680,6 +1692,46 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.OneMinusNode", + "m_ObjectId": "100efcb0a6fc47d29af864b62b6321a4", + "m_Group": { + "m_Id": "1c0a6f775de64259b7b14e8983abcdc7" + }, + "m_Name": "One Minus", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 2018.0001220703125, + "y": -50.9999885559082, + "width": 127.9998779296875, + "height": 94.00001525878906 + } + }, + "m_Slots": [ + { + "m_Id": "8a4d5b6d593a4e9d8207c195ffe3b0e4" + }, + { + "m_Id": "927cf9de93514ec696f446c9b1ccc344" + } + ], + "synonyms": [ + "complement", + "invert", + "opposite" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -1933,67 +1985,19 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "16e4a29e0acd4de5b23d8aef6c83ae7a", - "m_Id": 1, - "m_DisplayName": "B", - "m_SlotType": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "178f0c3200804f07b04441315826aa99", + "m_Id": 0, + "m_DisplayName": "RGBA", + "m_SlotType": 1, "m_Hidden": false, - "m_ShaderOutputName": "B", - "m_StageCapability": 3, + "m_ShaderOutputName": "RGBA", + "m_StageCapability": 2, "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.Vector4MaterialSlot", - "m_ObjectId": "178f0c3200804f07b04441315826aa99", - "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 + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 }, "m_DefaultValue": { "x": 0.0, @@ -2548,9 +2552,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 1937.9979248046875, - "y": 578.765625, - "width": 208.00003051757813, + "x": 1622.0, + "y": 631.0, + "width": 208.0, "height": 302.0 } }, @@ -2587,10 +2591,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1621.4000244140625, - "y": -1575.0, + "x": -1866.0001220703125, + "y": -1609.0001220703125, "width": 208.0, - "height": 301.5999755859375 + "height": 302.0 } }, "m_Slots": [ @@ -3588,7 +3592,7 @@ "m_Title": "Lighting", "m_Position": { "x": -391.0, - "y": -288.0 + "y": -353.0 } } @@ -4227,6 +4231,54 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "5dd2fc3cbb7844b6a748badc7111df7b", + "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.Texture2DInputMaterialSlot", @@ -4296,10 +4348,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -74.16262817382813, - "y": -1233.362548828125, - "width": 208.0, - "height": 325.5999755859375 + "x": -119.99995422363281, + "y": -1349.0001220703125, + "width": 207.9999542236328, + "height": 326.00006103515627 } }, "m_Slots": [ @@ -4322,7 +4374,7 @@ "else" ], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { @@ -4677,8 +4729,8 @@ "m_ObjectId": "6e4812aa3f8c4aa9a01dcf40fabd965a", "m_Title": "Specular intensity", "m_Position": { - "x": 10.0, - "y": 10.0 + "x": 2192.0, + "y": 36.00002670288086 } } @@ -4784,10 +4836,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1940.8001708984375, - "y": -1628.800048828125, - "width": 208.0, - "height": 301.60009765625 + "x": -2192.000244140625, + "y": -1609.0001220703125, + "width": 208.0001220703125, + "height": 302.0 } }, "m_Slots": [ @@ -4851,54 +4903,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "7805e3ef35274d26a0516063dee0fda0", - "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.DynamicVectorMaterialSlot", @@ -5215,10 +5219,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1362.4000244140625, - "y": -1433.5999755859375, - "width": 207.9998779296875, - "height": 431.199951171875 + "x": -1295.0001220703125, + "y": -1422.0, + "width": 208.0001220703125, + "height": 433.0 } }, "m_Slots": [ @@ -5383,6 +5387,30 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "8a4d5b6d593a4e9d8207c195ffe3b0e4", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "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_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -5560,49 +5588,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", - "m_ObjectId": "8cb292a1d0d548c28a671e2cf095cc70", - "m_Group": { - "m_Id": "47f21ffe118d40a3b49c1e3f141f9d8b" - }, - "m_Name": "Multiply", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 141.9979248046875, - "y": -229.23431396484376, - "width": 208.0, - "height": 302.0 - } - }, - "m_Slots": [ - { - "m_Id": "7805e3ef35274d26a0516063dee0fda0" - }, - { - "m_Id": "16e4a29e0acd4de5b23d8aef6c83ae7a" - }, - { - "m_Id": "07e5855843ca4a3197a0aea92bcbe292" - } - ], - "synonyms": [ - "multiplication", - "times", - "x" - ], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", @@ -5645,6 +5630,54 @@ "m_Space": 4 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "8e19624f54b34a359a8b7d7d52ebadb6", + "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.SubGraphNode", @@ -5766,6 +5799,30 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "927cf9de93514ec696f446c9b1ccc344", + "m_Id": 1, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", @@ -5914,7 +5971,7 @@ "m_StageCapability": 3, "m_Value": { "x": 0.0, - "y": 0.0, + "y": 1.0, "z": 0.0, "w": 0.0 }, @@ -6436,205 +6493,30 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "a9167bb186b844e583d1784452ddfbad", - "m_Id": 1, - "m_DisplayName": "In", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "In", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "aa009c3ecfdb41619c6087397cc1b668", - "m_Id": 0, - "m_DisplayName": "Edge", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Edge", - "m_StageCapability": 3, - "m_Value": { - "x": 0.009999999776482582, - "y": 1.0, - "z": 1.0, - "w": 1.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "aa3bd97d5d0743d2a2d6f1e06ebe7117", - "m_Id": 1773399364, - "m_DisplayName": "Smoothness", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "_Smoothness", - "m_StageCapability": 3, - "m_Value": 1.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "aa3cdb5c03fc4b53b4b7dcffda4d22a1", - "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": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", - "m_ObjectId": "aa4d38841d4c4e9ebf4e491a31ebee08", - "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", - "m_ObjectId": "aac7f816216c479ba549901d91ae4a6a", - "m_Id": 0, - "m_DisplayName": "Smoothness", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "aad9bf98a276455fbe17a64375e3384a", - "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": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "a9167bb186b844e583d1784452ddfbad", + "m_Id": 1, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", "m_ObjectId": "ac52cea1e42d4c169842cbf2491bbefa", "m_Group": { @@ -6751,10 +6633,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 141.5999298095703, - "y": -862.4000244140625, - "width": 208.00001525878907, - "height": 301.5999755859375 + "x": 209.0, + "y": -862.0000610351563, + "width": 208.00006103515626, + "height": 302.0 } }, "m_Slots": [ @@ -7458,10 +7340,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2474.400146484375, - "y": -1640.0001220703125, + "x": -2668.0, + "y": -1665.0, "width": 208.0, - "height": 312.8001708984375 + "height": 315.0 } }, "m_Slots": [ @@ -7693,10 +7575,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2316.0, - "y": -1276.0, - "width": 207.999755859375, - "height": 301.60003662109377 + "x": -2353.0, + "y": -1273.0001220703125, + "width": 208.0, + "height": 302.00006103515627 } }, "m_Slots": [ @@ -7827,7 +7709,7 @@ "m_ShaderOutputName": "B", "m_StageCapability": 3, "m_Value": { - "x": 0.009999999776482582, + "x": 0.0, "y": 0.0, "z": 0.0, "w": 0.0 @@ -8188,10 +8070,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2079.199951171875, - "y": -1267.199951171875, + "x": -2088.0, + "y": -1273.0001220703125, "width": 208.0, - "height": 277.5999755859375 + "height": 278.00006103515627 } }, "m_Slots": [ @@ -8337,6 +8219,54 @@ "m_OutputChannel": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "e1e303df869c4e89a7480a7d25676660", + "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": 0, "m_Type": "UnityEditor.ShaderGraph.GroupData", @@ -9322,3 +9252,178 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "aa009c3ecfdb41619c6087397cc1b668", + "m_Id": 0, + "m_DisplayName": "Edge", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Edge", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0010000000474974514, + "y": 1.0, + "z": 1.0, + "w": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "aa3bd97d5d0743d2a2d6f1e06ebe7117", + "m_Id": 1773399364, + "m_DisplayName": "Smoothness", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "_Smoothness", + "m_StageCapability": 3, + "m_Value": 1.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "aa3cdb5c03fc4b53b4b7dcffda4d22a1", + "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": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "aa4d38841d4c4e9ebf4e491a31ebee08", + "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", + "m_ObjectId": "aac7f816216c479ba549901d91ae4a6a", + "m_Id": 0, + "m_DisplayName": "Smoothness", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "aad9bf98a276455fbe17a64375e3384a", + "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 + } +} +