From dff8c9410c7b93cb3f7cf7583e564bf719d1842e Mon Sep 17 00:00:00 2001 From: xpeng <1216772231@qq.com> Date: Sun, 31 Jul 2022 22:58:57 +0200 Subject: [PATCH] #37 better shader --- Assets/Material/Display.mat | 2 +- Assets/Material/Touch Shader.shadergraph | 1499 ++++++++++++++++++-- Assets/Material/WacUnity/Light.mat | 8 +- Assets/Scenes/WACVR.unity | 26 +- Assets/Script/LightManager/LightManager.cs | 2 + ProjectSettings/ProjectSettings.asset | 2 - 6 files changed, 1435 insertions(+), 104 deletions(-) diff --git a/Assets/Material/Display.mat b/Assets/Material/Display.mat index fdbd065..25809d7 100644 --- a/Assets/Material/Display.mat +++ b/Assets/Material/Display.mat @@ -45,7 +45,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Material/Touch Shader.shadergraph b/Assets/Material/Touch Shader.shadergraph index da5b620..71cc936 100644 --- a/Assets/Material/Touch Shader.shadergraph +++ b/Assets/Material/Touch Shader.shadergraph @@ -20,6 +20,15 @@ }, { "m_Id": "a5491b0be3fa4ec0be21395df9fd48f1" + }, + { + "m_Id": "fbd0bebfb0b44ffebc35108b1f1807d8" + }, + { + "m_Id": "0acbb0bd8fc546dc9f8420729ecec192" + }, + { + "m_Id": "8288b244ab2547ef9f482fa0720a0978" } ], "m_Keywords": [], @@ -90,14 +99,44 @@ { "m_Id": "1f936ab49cde4e738fbab31620f834e1" }, - { - "m_Id": "cf7fb8d8ca9b4d98a078f52f242c7681" - }, { "m_Id": "5b0b199d14644ba09555bad5640699f7" }, { "m_Id": "5bd181ad68674202a4e0bc64353fcf32" + }, + { + "m_Id": "c7ebaa82989149698450bb6c7c25e463" + }, + { + "m_Id": "9a01b6bdcbd34ccfa0e97eccbf03ca04" + }, + { + "m_Id": "08502dcb01a34419b3814985e0def105" + }, + { + "m_Id": "6671d079b0714919a20de38ef02431ad" + }, + { + "m_Id": "6a66b0f3ed9c40d19d0e2d6f573d71b8" + }, + { + "m_Id": "7065ace13037479c8322d9786b717a51" + }, + { + "m_Id": "70affc60b0e54791bf0d4ad4d081f1db" + }, + { + "m_Id": "79ab1cf91b314158b7f3eb5790764022" + }, + { + "m_Id": "ccbf074635b946a0a5e93aeb3fa16dce" + }, + { + "m_Id": "f810cd490cb8441fade1225ed55574bf" + }, + { + "m_Id": "17c3ef2ff1ec47159139ef552eebab0b" } ], "m_GroupDatas": [], @@ -120,7 +159,7 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "1f936ab49cde4e738fbab31620f834e1" + "m_Id": "08502dcb01a34419b3814985e0def105" }, "m_SlotId": 2 }, @@ -131,6 +170,34 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "17c3ef2ff1ec47159139ef552eebab0b" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "f810cd490cb8441fade1225ed55574bf" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "1f936ab49cde4e738fbab31620f834e1" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "08502dcb01a34419b3814985e0def105" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -187,6 +254,76 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "6671d079b0714919a20de38ef02431ad" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "08502dcb01a34419b3814985e0def105" + }, + "m_SlotId": 3 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "6a66b0f3ed9c40d19d0e2d6f573d71b8" + }, + "m_SlotId": 3 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "08502dcb01a34419b3814985e0def105" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "7065ace13037479c8322d9786b717a51" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "c7ebaa82989149698450bb6c7c25e463" + }, + "m_SlotId": 3 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "70affc60b0e54791bf0d4ad4d081f1db" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "1f936ab49cde4e738fbab31620f834e1" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "79ab1cf91b314158b7f3eb5790764022" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "70affc60b0e54791bf0d4ad4d081f1db" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -243,6 +380,34 @@ "m_SlotId": 1 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "9a01b6bdcbd34ccfa0e97eccbf03ca04" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "17c3ef2ff1ec47159139ef552eebab0b" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "9a01b6bdcbd34ccfa0e97eccbf03ca04" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "c7ebaa82989149698450bb6c7c25e463" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -260,13 +425,13 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "cdfc06a24ced4af49c374442aafc2b78" + "m_Id": "c7ebaa82989149698450bb6c7c25e463" }, - "m_SlotId": 2 + "m_SlotId": 4 }, "m_InputSlot": { "m_Node": { - "m_Id": "9b6c1c1aaa294c75933228000c9d818a" + "m_Id": "6a66b0f3ed9c40d19d0e2d6f573d71b8" }, "m_SlotId": 0 } @@ -274,13 +439,27 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "cf7fb8d8ca9b4d98a078f52f242c7681" + "m_Id": "ccbf074635b946a0a5e93aeb3fa16dce" }, "m_SlotId": 0 }, "m_InputSlot": { "m_Node": { - "m_Id": "1f936ab49cde4e738fbab31620f834e1" + "m_Id": "70affc60b0e54791bf0d4ad4d081f1db" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "cdfc06a24ced4af49c374442aafc2b78" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "9b6c1c1aaa294c75933228000c9d818a" }, "m_SlotId": 0 } @@ -312,12 +491,26 @@ }, "m_SlotId": 2 } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "f810cd490cb8441fade1225ed55574bf" + }, + "m_SlotId": 3 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "70affc60b0e54791bf0d4ad4d081f1db" + }, + "m_SlotId": 3 + } } ], "m_VertexContext": { "m_Position": { - "x": 491.199951171875, - "y": -2.3999898433685304 + "x": 776.0000610351563, + "y": 26.4000301361084 }, "m_Blocks": [ { @@ -333,8 +526,8 @@ }, "m_FragmentContext": { "m_Position": { - "x": 491.199951171875, - "y": 239.199951171875 + "x": 776.0000610351563, + "y": 280.0 }, "m_Blocks": [ { @@ -365,7 +558,7 @@ "preventRotation": false }, "m_Path": "Shader Graphs", - "m_GraphPrecision": 1, + "m_GraphPrecision": 2, "m_PreviewMode": 2, "m_OutputNode": { "m_Id": "" @@ -389,10 +582,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -39.20000457763672, - "y": 430.4000244140625, - "width": 131.20004272460938, - "height": 33.600006103515628 + "x": -12.799995422363282, + "y": 430.3999938964844, + "width": 131.20001220703126, + "height": 33.60003662109375 } }, "m_Slots": [ @@ -491,6 +684,121 @@ "m_SerializedDescriptor": "SurfaceDescription.Metallic" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlendNode", + "m_ObjectId": "08502dcb01a34419b3814985e0def105", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Blend", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 592.0000610351563, + "y": 664.7999877929688, + "width": 207.99993896484376, + "height": 359.20001220703127 + } + }, + "m_Slots": [ + { + "m_Id": "5125b4c039fb4737855e604648eb3bfa" + }, + { + "m_Id": "574f8ca6131442eeaab9b4b63294c361" + }, + { + "m_Id": "a224c24befe04d58a0915926926e11f0" + }, + { + "m_Id": "4240010388204ab9ba820be365c5be12" + } + ], + "synonyms": [ + "burn", + "darken", + "difference", + "dodge", + "divide", + "exclusion", + "hard light", + "hard mix", + "linear burn", + "linear dodge", + "linear light", + "multiply", + "negate", + "overlay", + "pin light", + "screen", + "soft light", + "subtract", + "vivid light", + "overwrite" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_BlendMode": 13 +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "0acbb0bd8fc546dc9f8420729ecec192", + "m_Guid": { + "m_GuidSerialized": "d8dc093a-ae84-4324-a52f-02a6e729aa5b" + }, + "m_Name": "VignettHardness", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "VignettHardness", + "m_DefaultReferenceName": "_VignettHardness", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": -0.15000000596046449, + "m_FloatType": 0, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "0c1681398ed64c9f833a3fefda14b4cb", + "m_Id": 0, + "m_DisplayName": "EmissionColor", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", @@ -539,6 +847,48 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.AddNode", + "m_ObjectId": "17c3ef2ff1ec47159139ef552eebab0b", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Add", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1113.599853515625, + "y": 813.5999755859375, + "width": 207.99993896484376, + "height": 301.5999755859375 + } + }, + "m_Slots": [ + { + "m_Id": "b8c66640466d4a759e98e26afb9e224c" + }, + { + "m_Id": "1e25969c7da049f4a4982769116e07f6" + }, + { + "m_Id": "d015a8fc6e624e11ae8098abc897db0e" + } + ], + "synonyms": [ + "addition", + "sum", + "plus" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -563,6 +913,27 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "1ce2f65a95dc491e835760a70a9a2d2c", + "m_Id": 1, + "m_DisplayName": "In Min Max", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "InMinMax", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.30000001192092898 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 3, "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", @@ -592,6 +963,30 @@ "m_ColorMode": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "1e25969c7da049f4a4982769116e07f6", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.25, + "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.BlendNode", @@ -604,10 +999,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 142.4000244140625, - "y": 648.800048828125, - "width": 207.99996948242188, - "height": 359.199951171875 + "x": 170.3999786376953, + "y": 652.0, + "width": 207.99998474121095, + "height": 359.20001220703127 } }, "m_Slots": [ @@ -792,6 +1187,78 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "3899af11a9514bb7b6dcd3274202db34", + "m_Id": 1, + "m_DisplayName": "Center", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Center", + "m_StageCapability": 3, + "m_Value": { + "x": 0.5, + "y": 0.5, + "z": 0.5, + "w": 0.5 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "3e2b9c773dfe42a58b14169d970613ff", + "m_Id": 0, + "m_DisplayName": "Base", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Base", + "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": "4240010388204ab9ba820be365c5be12", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -877,6 +1344,30 @@ "m_Space": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "5125b4c039fb4737855e604648eb3bfa", + "m_Id": 0, + "m_DisplayName": "Base", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Base", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -889,9 +1380,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -34.399959564208987, - "y": 588.800048828125, - "width": 126.39999389648438, + "x": 8.0, + "y": 754.4000244140625, + "width": 127.19998168945313, "height": 33.5999755859375 } }, @@ -941,6 +1432,67 @@ "m_ColorMode": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", + "m_ObjectId": "53957b902c614f498d2d1717fd211ae7", + "m_Id": 0, + "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.Vector1MaterialSlot", + "m_ObjectId": "55f8cb1677b547c093d01efedde6e804", + "m_Id": 3, + "m_DisplayName": "Hardness", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Hardness", + "m_StageCapability": 3, + "m_Value": -0.14000000059604646, + "m_DefaultValue": 0.800000011920929, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "574f8ca6131442eeaab9b4b63294c361", + "m_Id": 1, + "m_DisplayName": "Blend", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Blend", + "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", @@ -953,10 +1505,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -214.40000915527345, - "y": 313.6000061035156, - "width": 208.00003051757813, - "height": 301.5999450683594 + "x": -208.0, + "y": 312.79998779296877, + "width": 208.0, + "height": 301.60003662109377 } }, "m_Slots": [ @@ -995,9 +1547,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -464.8000183105469, - "y": 296.79998779296877, - "width": 160.00006103515626, + "x": -452.7999572753906, + "y": 280.0, + "width": 160.0, "height": 33.600006103515628 } }, @@ -1018,6 +1570,21 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "5dd7f483a6664d778bb75d30a7b3bf16", + "m_Id": 1, + "m_DisplayName": "Width", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Width", + "m_StageCapability": 3, + "m_Value": 1.0, + "m_DefaultValue": 0.5, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -1033,6 +1600,21 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "615afcac343641a9bb82cd121c446bb8", + "m_Id": 3, + "m_DisplayName": "Opacity", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Opacity", + "m_StageCapability": 3, + "m_Value": 1.0, + "m_DefaultValue": 1.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot", @@ -1057,6 +1639,56 @@ "m_Space": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "653d3364bee04afda97e9b27878c95da", + "m_Id": 0, + "m_DisplayName": "VignettHardness", + "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.PropertyNode", + "m_ObjectId": "6671d079b0714919a20de38ef02431ad", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 437.60003662109377, + "y": 894.4000854492188, + "width": 112.800048828125, + "height": 33.5999755859375 + } + }, + "m_Slots": [ + { + "m_Id": "ee6b6c2dac2448c7b9af6e4fdee5a2e3" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "fbd0bebfb0b44ffebc35108b1f1807d8" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.CategoryData", @@ -1069,6 +1701,9 @@ { "m_Id": "1dff24b8d49c4901a2f35b2a5d4abb99" }, + { + "m_Id": "8288b244ab2547ef9f482fa0720a0978" + }, { "m_Id": "531a61cf808a4d15862a30cc7b4d1e61" }, @@ -1080,10 +1715,57 @@ }, { "m_Id": "a5491b0be3fa4ec0be21395df9fd48f1" + }, + { + "m_Id": "fbd0bebfb0b44ffebc35108b1f1807d8" + }, + { + "m_Id": "0acbb0bd8fc546dc9f8420729ecec192" } ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.RemapNode", + "m_ObjectId": "6a66b0f3ed9c40d19d0e2d6f573d71b8", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Remap", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 10.40001106262207, + "y": 1012.0, + "width": 208.0, + "height": 325.60009765625 + } + }, + "m_Slots": [ + { + "m_Id": "8212640ea4414bf3b06303626394bf84" + }, + { + "m_Id": "1ce2f65a95dc491e835760a70a9a2d2c" + }, + { + "m_Id": "8a0e52325d3e4a4d9021cf2279625c82" + }, + { + "m_Id": "8c12dbb8866f457bafdaf69af9a0a7a3" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -1099,6 +1781,65 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "6d82b3c7e22c4cc691d6511d91e5d381", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "7065ace13037479c8322d9786b717a51", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -521.5999755859375, + "y": 1124.8001708984375, + "width": 163.199951171875, + "height": 33.5999755859375 + } + }, + "m_Slots": [ + { + "m_Id": "653d3364bee04afda97e9b27878c95da" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "0acbb0bd8fc546dc9f8420729ecec192" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", @@ -1132,6 +1873,69 @@ "m_SerializedDescriptor": "SurfaceDescription.Occlusion" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlendNode", + "m_ObjectId": "70affc60b0e54791bf0d4ad4d081f1db", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Blend", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -220.8000030517578, + "y": 668.7999877929688, + "width": 207.99998474121095, + "height": 359.20001220703127 + } + }, + "m_Slots": [ + { + "m_Id": "3e2b9c773dfe42a58b14169d970613ff" + }, + { + "m_Id": "806bed989b2e4e9db2907cb6358a900b" + }, + { + "m_Id": "615afcac343641a9bb82cd121c446bb8" + }, + { + "m_Id": "6d82b3c7e22c4cc691d6511d91e5d381" + } + ], + "synonyms": [ + "burn", + "darken", + "difference", + "dodge", + "divide", + "exclusion", + "hard light", + "hard mix", + "linear burn", + "linear dodge", + "linear light", + "multiply", + "negate", + "overlay", + "pin light", + "screen", + "soft light", + "subtract", + "vivid light", + "overwrite" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_BlendMode": 21 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", @@ -1201,6 +2005,41 @@ "m_SerializedDescriptor": "SurfaceDescription.Smoothness" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "79ab1cf91b314158b7f3eb5790764022", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -468.0000305175781, + "y": 720.0000610351563, + "width": 151.20001220703126, + "height": 33.59991455078125 + } + }, + "m_Slots": [ + { + "m_Id": "0c1681398ed64c9f833a3fefda14b4cb" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "1dff24b8d49c4901a2f35b2a5d4abb99" + } +} + { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", @@ -1220,7 +2059,7 @@ "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, "m_Hidden": false, - "m_Value": 0.009999999776482582, + "m_Value": 0.10000000149011612, "m_FloatType": 1, "m_RangeValues": { "x": -0.5, @@ -1228,6 +2067,30 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "806bed989b2e4e9db2907cb6358a900b", + "m_Id": 1, + "m_DisplayName": "Blend", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Blend", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -1238,11 +2101,35 @@ "m_Hidden": false, "m_ShaderOutputName": "Metallic", "m_StageCapability": 2, - "m_Value": 0.0, + "m_Value": 0.30000001192092898, "m_DefaultValue": 0.0, "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "8212640ea4414bf3b06303626394bf84", + "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.Vector1MaterialSlot", @@ -1253,11 +2140,40 @@ "m_Hidden": false, "m_ShaderOutputName": "Smoothness", "m_StageCapability": 2, - "m_Value": 0.5, + "m_Value": 0.699999988079071, "m_DefaultValue": 0.5, "m_Labels": [] } +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", + "m_ObjectId": "8288b244ab2547ef9f482fa0720a0978", + "m_Guid": { + "m_GuidSerialized": "8c484b4e-dea7-427a-a5b0-79a96eea5fcc" + }, + "m_Name": "EmissionColor2", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "EmissionColor2", + "m_DefaultReferenceName": "_EmissionColor2", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "isMainColor": false, + "m_ColorMode": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector2Node", @@ -1329,6 +2245,75 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "8a0e52325d3e4a4d9021cf2279625c82", + "m_Id": 2, + "m_DisplayName": "Out Min Max", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "OutMinMax", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "8c12dbb8866f457bafdaf69af9a0a7a3", + "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_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "8d214205a86e438d84363e88abc94602", + "m_Id": 4, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.TilingAndOffsetNode", @@ -1433,10 +2418,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -35.199989318847659, + "x": -12.799995422363282, "y": 464.0000305175781, - "width": 127.20001983642578, - "height": 33.5999755859375 + "width": 127.20000457763672, + "height": 33.599945068359378 } }, "m_Slots": [ @@ -1468,10 +2453,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -476.79998779296877, - "y": 371.1999816894531, - "width": 208.0, - "height": 359.2000427246094 + "x": -468.0000305175781, + "y": 360.79998779296877, + "width": 208.00003051757813, + "height": 359.20001220703127 } }, "m_Slots": [ @@ -1533,6 +2518,43 @@ "m_SerializedDescriptor": "VertexDescription.Tangent" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVNode", + "m_ObjectId": "9a01b6bdcbd34ccfa0e97eccbf03ca04", + "m_Group": { + "m_Id": "" + }, + "m_Name": "UV", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1479.9998779296875, + "y": 1002.39990234375, + "width": 208.0, + "height": 311.199951171875 + } + }, + "m_Slots": [ + { + "m_Id": "bea067863079434584a7b8eea1146e60" + } + ], + "synonyms": [ + "texcoords", + "coords", + "coordinates" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_OutputChannel": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", @@ -1621,6 +2643,21 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "a224c24befe04d58a0915926926e11f0", + "m_Id": 3, + "m_DisplayName": "Opacity", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Opacity", + "m_StageCapability": 3, + "m_Value": 0.7699999809265137, + "m_DefaultValue": 1.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -1689,7 +2726,7 @@ "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, "m_Hidden": false, - "m_Value": 0.20000000298023225, + "m_Value": 0.5, "m_FloatType": 1, "m_RangeValues": { "x": 0.0, @@ -1697,6 +2734,21 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "a6ff81cc0e6a4745ad54d50d4a3208bb", + "m_Id": 2, + "m_DisplayName": "Height", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Height", + "m_StageCapability": 3, + "m_Value": 0.5, + "m_DefaultValue": 0.5, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -1721,6 +2773,21 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "aa7cb0856b024181ab20378ab3f883d1", + "m_Id": 3, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", @@ -1834,6 +2901,31 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "b589440404a74b149f75c05ca0a3f1db", + "m_Id": 0, + "m_DisplayName": "EmissionColor2", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", @@ -1855,6 +2947,30 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "b8c66640466d4a759e98e26afb9e224c", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "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", @@ -1896,6 +3012,31 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "bea067863079434584a7b8eea1146e60", + "m_Id": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", @@ -1944,6 +3085,50 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SphereMaskNode", + "m_ObjectId": "c7ebaa82989149698450bb6c7c25e463", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Sphere Mask", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -292.8000183105469, + "y": 1008.0, + "width": 208.0, + "height": 349.60009765625 + } + }, + "m_Slots": [ + { + "m_Id": "ccff68e62f3a46f4a2e903a9111566b3" + }, + { + "m_Id": "3899af11a9514bb7b6dcd3274202db34" + }, + { + "m_Id": "f382ae4a61c6407cab9dbb178e35b3da" + }, + { + "m_Id": "55f8cb1677b547c093d01efedde6e804" + }, + { + "m_Id": "8d214205a86e438d84363e88abc94602" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", @@ -1971,6 +3156,65 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "ccbf074635b946a0a5e93aeb3fa16dce", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -475.2000427246094, + "y": 753.6000366210938, + "width": 158.4000244140625, + "height": 33.5999755859375 + } + }, + "m_Slots": [ + { + "m_Id": "b589440404a74b149f75c05ca0a3f1db" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "8288b244ab2547ef9f482fa0720a0978" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "ccff68e62f3a46f4a2e903a9111566b3", + "m_Id": 0, + "m_DisplayName": "Coords", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Coords", + "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.BlendNode", @@ -1983,10 +3227,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 142.40000915527345, - "y": 289.6000061035156, - "width": 208.00001525878907, - "height": 359.2000427246094 + "x": 170.39999389648438, + "y": 239.20001220703126, + "width": 208.0, + "height": 359.20001220703127 } }, "m_Slots": [ @@ -2036,36 +3280,25 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.PropertyNode", - "m_ObjectId": "cf7fb8d8ca9b4d98a078f52f242c7681", - "m_Group": { - "m_Id": "" + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "d015a8fc6e624e11ae8098abc897db0e", + "m_Id": 2, + "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_Name": "Property", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -58.399967193603519, - "y": 555.2000732421875, - "width": 151.2000274658203, - "height": 33.5999755859375 - } - }, - "m_Slots": [ - { - "m_Id": "e73f36a25c0e434e8cf28c817be3c6f8" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_Property": { - "m_Id": "1dff24b8d49c4901a2f35b2a5d4abb99" + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 } } @@ -2168,10 +3401,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -498.39996337890627, - "y": 447.20001220703127, - "width": 125.5999755859375, - "height": 33.600006103515628 + "x": -638.4000854492188, + "y": 672.0000610351563, + "width": 125.60003662109375, + "height": 33.59991455078125 } }, "m_Slots": [ @@ -2276,26 +3509,16 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", - "m_ObjectId": "e73f36a25c0e434e8cf28c817be3c6f8", + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "ee6b6c2dac2448c7b9af6e4fdee5a2e3", "m_Id": 0, - "m_DisplayName": "EmissionColor", + "m_DisplayName": "Vignett", "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_Value": 0.0, + "m_DefaultValue": 0.0, "m_Labels": [] } @@ -2356,6 +3579,21 @@ "m_SerializedDescriptor": "VertexDescription.Normal" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "f382ae4a61c6407cab9dbb178e35b3da", + "m_Id": 2, + "m_DisplayName": "Radius", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Radius", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.10000000149011612, + "m_Labels": [] +} + { "m_SGVersion": 1, "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", @@ -2376,6 +3614,77 @@ "m_SupportVFX": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.RectangleNode", + "m_ObjectId": "f810cd490cb8441fade1225ed55574bf", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Rectangle", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -742.3999633789063, + "y": 745.5999755859375, + "width": 207.99993896484376, + "height": 359.2000732421875 + } + }, + "m_Slots": [ + { + "m_Id": "53957b902c614f498d2d1717fd211ae7" + }, + { + "m_Id": "5dd7f483a6664d778bb75d30a7b3bf16" + }, + { + "m_Id": "a6ff81cc0e6a4745ad54d50d4a3208bb" + }, + { + "m_Id": "aa7cb0856b024181ab20378ab3f883d1" + } + ], + "synonyms": [ + "square" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_ClampType": 0 +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "fbd0bebfb0b44ffebc35108b1f1807d8", + "m_Guid": { + "m_GuidSerialized": "83b162b1-d6ab-4443-9f4f-4ea9ea14d360" + }, + "m_Name": "Vignett", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Vignett", + "m_DefaultReferenceName": "_Vignett", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": 0.20000000298023225, + "m_FloatType": 0, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", diff --git a/Assets/Material/WacUnity/Light.mat b/Assets/Material/WacUnity/Light.mat index 511fff5..6de88b2 100644 --- a/Assets/Material/WacUnity/Light.mat +++ b/Assets/Material/WacUnity/Light.mat @@ -26,7 +26,7 @@ Material: m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 6 - m_EnableInstancingVariants: 0 + m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} @@ -109,7 +109,7 @@ Material: - _GlossyReflections: 1 - _LineCount: 8 - _LineEmitOpasity: 0.2 - - _LineHight: 0.01 + - _LineHight: 0.1 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 @@ -126,10 +126,12 @@ Material: - _SrcBlend: 1 - _Surface: 0 - _UVSec: 0 + - _Vignett: 0.4 + - _VignettHardness: -0.15 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.4056604, g: 0.4056604, b: 0.4056604, a: 1} + - _BaseColor: {r: 0.2924528, g: 0.2924528, b: 0.2924528, a: 1} - _Color: {r: 0.34905657, g: 0.34905657, b: 0.34905657, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _LineColor: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Scenes/WACVR.unity b/Assets/Scenes/WACVR.unity index 74b33a4..4c69062 100644 --- a/Assets/Scenes/WACVR.unity +++ b/Assets/Scenes/WACVR.unity @@ -21536,13 +21536,23 @@ PrefabInstance: - target: {fileID: 393777075064552474, guid: cf8684b3c4f47b94aa7cb23ce498caf3, type: 3} propertyPath: m_LocalScale.y - value: 1.02 + value: 1.1 objectReference: {fileID: 0} - target: {fileID: 393777075064552474, guid: cf8684b3c4f47b94aa7cb23ce498caf3, type: 3} propertyPath: m_LocalScale.z value: 1.02 objectReference: {fileID: 0} + - target: {fileID: 393777075064552474, guid: cf8684b3c4f47b94aa7cb23ce498caf3, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.00023 + objectReference: {fileID: 0} + - target: {fileID: 393777075064552474, guid: cf8684b3c4f47b94aa7cb23ce498caf3, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.01269 + objectReference: {fileID: 0} - target: {fileID: 395471909685690544, guid: cf8684b3c4f47b94aa7cb23ce498caf3, type: 3} propertyPath: m_CastShadows @@ -21618,6 +21628,16 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 0 objectReference: {fileID: 0} + - target: {fileID: 672568126412091756, guid: cf8684b3c4f47b94aa7cb23ce498caf3, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.000031 + objectReference: {fileID: 0} + - target: {fileID: 672568126412091756, guid: cf8684b3c4f47b94aa7cb23ce498caf3, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} - target: {fileID: 674035908820035380, guid: cf8684b3c4f47b94aa7cb23ce498caf3, type: 3} propertyPath: m_StaticEditorFlags @@ -23751,12 +23771,12 @@ PrefabInstance: - target: {fileID: 6609493762104327279, guid: cf8684b3c4f47b94aa7cb23ce498caf3, type: 3} propertyPath: m_LocalPosition.y - value: 0.00075 + value: 0.000944 objectReference: {fileID: 0} - target: {fileID: 6609493762104327279, guid: cf8684b3c4f47b94aa7cb23ce498caf3, type: 3} propertyPath: m_LocalPosition.z - value: 0.0121 + value: 0.012048 objectReference: {fileID: 0} - target: {fileID: 6618956848436274754, guid: cf8684b3c4f47b94aa7cb23ce498caf3, type: 3} diff --git a/Assets/Script/LightManager/LightManager.cs b/Assets/Script/LightManager/LightManager.cs index 5854c78..1694bfb 100644 --- a/Assets/Script/LightManager/LightManager.cs +++ b/Assets/Script/LightManager/LightManager.cs @@ -58,7 +58,9 @@ public class LightManager : MonoBehaviour for (int ii = 0; ii < 4; ii++) { Materials[119 - i - ii * 30].SetColor("_EmissionColor", RGBColor2D.GetPixel(index * 2, 0)); + Materials[119 - i - ii * 30].SetColor("_EmissionColor2", RGBColor2D.GetPixel(index * 2 + 1, 0)); Materials[210 + i - ii * 30].SetColor("_EmissionColor", RGBColor2D.GetPixel((index + 120) * 2, 0)); + Materials[210 + i - ii * 30].SetColor("_EmissionColor2", RGBColor2D.GetPixel((index + 120) * 2 + 1, 0)); index++; } } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 358a21b..9f3b190 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -137,8 +137,6 @@ PlayerSettings: bundleVersion: 0.1.1 preloadedAssets: - {fileID: 11400000, guid: 74eeb7429f216ca45a7093c586513e98, type: 2} - - {fileID: -6348321304186183749, guid: 6460523340b221f4ea5611d2c011a26c, type: 2} - - {fileID: -6265376527240436808, guid: 5e2dc0db42cc5b3459a781fecb0b76f9, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1