diff --git a/Runtime/Scripts/VA_AnimationLibraryComponentAuthoring.cs b/Runtime/Scripts/VA_AnimationLibraryComponentAuthoring.cs index 48ee9e7..8d8e355 100644 --- a/Runtime/Scripts/VA_AnimationLibraryComponentAuthoring.cs +++ b/Runtime/Scripts/VA_AnimationLibraryComponentAuthoring.cs @@ -8,6 +8,7 @@ namespace TAO.VertexAnimation public class VA_AnimationLibraryComponentAuthoring : UnityEngine.MonoBehaviour { public VA_AnimationLibrary animationLibrary; + public bool debugMode = false; } public class VA_AnimationLibraryConversionSystem : GameObjectConversionSystem @@ -34,7 +35,11 @@ namespace TAO.VertexAnimation { // Copy data. animationDataArray[i] = animationLib.animationLibrary.animationData[i]; - UnityEngine.Debug.Log("VA_AnimationLibrary added " + animationDataArray[i].name.ToString()); + + if (animationLib.debugMode) + { + UnityEngine.Debug.Log("VA_AnimationLibrary added " + animationDataArray[i].name.ToString()); + } } // Construct blob asset reference. @@ -45,7 +50,10 @@ namespace TAO.VertexAnimation // Add it to the asset store. BlobAssetStore.TryAdd(new Hash128(VA_AnimationLibraryUtils.AnimationLibraryAssetStoreName), animLibAssetRef); - UnityEngine.Debug.Log("VA_AnimationLibrary has " + animLibAssetRef.Value.animations.Length.ToString() + " animations."); + if (animationLib.debugMode) + { + UnityEngine.Debug.Log("VA_AnimationLibrary has " + animLibAssetRef.Value.animations.Length.ToString() + " animations."); + } } // Remove the entity since we don't need it anymore. diff --git a/Runtime/Scripts/VA_AnimatorSystem.cs b/Runtime/Scripts/VA_AnimatorSystem.cs index b1308fa..00f56a0 100644 --- a/Runtime/Scripts/VA_AnimatorSystem.cs +++ b/Runtime/Scripts/VA_AnimatorSystem.cs @@ -34,6 +34,7 @@ namespace TAO.VertexAnimation } }) .WithNativeDisableContainerSafetyRestriction(animationData) + .WithName("VA_AnimatorSystem") .ScheduleParallel(); } } diff --git a/Runtime/Shaders/Graphs/Lit.ShaderGraph b/Runtime/Shaders/Graphs/Lit.ShaderGraph index d76ed20..c0790d9 100644 --- a/Runtime/Shaders/Graphs/Lit.ShaderGraph +++ b/Runtime/Shaders/Graphs/Lit.ShaderGraph @@ -30,6 +30,12 @@ { "m_Id": "647973c6b9d7d08e89b6831ff21aaaf0" }, + { + "m_Id": "ef585cca41ba4bd3858cb09898ac8d26" + }, + { + "m_Id": "b7cccfd432284353869549494c4a2adb" + }, { "m_Id": "f105625e9ef44d4c898f7ed315000014" }, @@ -52,9 +58,6 @@ { "m_Id": "81f4b8eb7f418186969fad0762cb8ab8" }, - { - "m_Id": "8962216feea02482acd951e3e9d27b74" - }, { "m_Id": "49d9b281e8a3d68da00bbdce7f9798bb" }, @@ -180,6 +183,30 @@ }, { "m_Id": "64bcd6375b6a4699bfec544e30dbe840" + }, + { + "m_Id": "3634bb2753944b73abea7e7200ca92b8" + }, + { + "m_Id": "92287c7ffb304016a4e2aba3b2bb3375" + }, + { + "m_Id": "ee7ebc9064514e86b632c9d98e3c4530" + }, + { + "m_Id": "10d9d3dcf8854f9d9a9ba72a49270723" + }, + { + "m_Id": "a371ce2e9d97463d96d814a45413df53" + }, + { + "m_Id": "09656b530fb2411a9a1e7610dd421f2c" + }, + { + "m_Id": "f3887f1dfdd44b62863c328af70a21ca" + }, + { + "m_Id": "5d480c1b2a08460bb3c57ddcc8efdc05" } ], "m_GroupDatas": [ @@ -203,6 +230,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "09656b530fb2411a9a1e7610dd421f2c" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "f3887f1dfdd44b62863c328af70a21ca" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -217,6 +258,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "10d9d3dcf8854f9d9a9ba72a49270723" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "ee7ebc9064514e86b632c9d98e3c4530" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -245,6 +300,20 @@ "m_SlotId": 654627568 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "3634bb2753944b73abea7e7200ca92b8" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "92287c7ffb304016a4e2aba3b2bb3375" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -385,6 +454,20 @@ "m_SlotId": 2 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "5d480c1b2a08460bb3c57ddcc8efdc05" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "ee4f544267bf4145bae7e3dad3c2ed6b" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -408,7 +491,7 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "ee4f544267bf4145bae7e3dad3c2ed6b" + "m_Id": "5d480c1b2a08460bb3c57ddcc8efdc05" }, "m_SlotId": 0 } @@ -514,15 +597,15 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "8962216feea02482acd951e3e9d27b74" + "m_Id": "91829ea0d0227788949ba077294ddc1d" }, - "m_SlotId": 0 + "m_SlotId": 3 }, "m_InputSlot": { "m_Node": { - "m_Id": "eace7df126164ddcac91b980d4a337eb" + "m_Id": "621ed7ef94f9278fac1d2a1d2693ee44" }, - "m_SlotId": 0 + "m_SlotId": 2 } }, { @@ -534,7 +617,7 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "621ed7ef94f9278fac1d2a1d2693ee44" + "m_Id": "92287c7ffb304016a4e2aba3b2bb3375" }, "m_SlotId": 2 } @@ -567,6 +650,20 @@ "m_SlotId": 2 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "92287c7ffb304016a4e2aba3b2bb3375" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "ee7ebc9064514e86b632c9d98e3c4530" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -595,6 +692,20 @@ "m_SlotId": 2 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "a371ce2e9d97463d96d814a45413df53" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "09656b530fb2411a9a1e7610dd421f2c" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -721,6 +832,20 @@ "m_SlotId": 1 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "ee7ebc9064514e86b632c9d98e3c4530" + }, + "m_SlotId": 3 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "09656b530fb2411a9a1e7610dd421f2c" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -735,6 +860,20 @@ "m_SlotId": 1 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "f3887f1dfdd44b62863c328af70a21ca" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "eace7df126164ddcac91b980d4a337eb" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -838,9 +977,6 @@ { "m_Id": "71e80e92e94142188b367e239de47046" }, - { - "m_Id": "eace7df126164ddcac91b980d4a337eb" - }, { "m_Id": "76cd96e5fa3a4c43afdb2cf135f37631" }, @@ -852,6 +988,9 @@ }, { "m_Id": "aa343738e2a24eaab98c222198e8a486" + }, + { + "m_Id": "eace7df126164ddcac91b980d4a337eb" } ] }, @@ -982,6 +1121,58 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "09656b530fb2411a9a1e7610dd421f2c", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1420.000244140625, + "y": 1311.0, + "width": 208.0, + "height": 302.0 + } + }, + "m_Slots": [ + { + "m_Id": "1c537e5eac934eb2b4aebd1051e95c1c" + }, + { + "m_Id": "d840bcba069d4e31a2dcf7ab4b17ac45" + }, + { + "m_Id": "8ca595ec72eb4838a8533db06de78ac4" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "0b03a0b7ea6446c68027c3caa6382c28", + "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_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", @@ -1064,6 +1255,90 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "0fa26f900f0f4b0c9b3f7d9bb219396e", + "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.Vector4MaterialSlot", + "m_ObjectId": "104b373985bd49ceb0616fac799e31af", + "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.PropertyNode", + "m_ObjectId": "10d9d3dcf8854f9d9a9ba72a49270723", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1841.0, + "y": 1351.0001220703125, + "width": 169.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "427bbfedd5b04c22b92dae263954b026" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "b7cccfd432284353869549494c4a2adb" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -1267,6 +1542,54 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "1c537e5eac934eb2b4aebd1051e95c1c", + "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": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", @@ -1365,6 +1688,21 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "2537379ba277494c89e48156207a7eb6", + "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_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", @@ -1441,6 +1779,40 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "3634bb2753944b73abea7e7200ca92b8", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -2233.0, + "y": 1375.0, + "width": 156.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "d2e0f4873a6443418d3db806e84cf902" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "ef585cca41ba4bd3858cb09898ac8d26" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", @@ -1530,6 +1902,30 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "39f876d9e6b64449b86f4cd45ca20e7e", + "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_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BranchNode", @@ -1629,6 +2025,20 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot", + "m_ObjectId": "3d3cb86bffaa4480b39cc4e90a5aaf8d", + "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.Vector1MaterialSlot", @@ -1687,6 +2097,20 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot", + "m_ObjectId": "427bbfedd5b04c22b92dae263954b026", + "m_Id": 0, + "m_DisplayName": "UseEmissionMap", + "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.UVMaterialSlot", @@ -1852,6 +2276,54 @@ "m_DefaultValue": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "4ad66d3b26e34cf3ae0590b434e88512", + "m_Id": 0, + "m_DisplayName": "", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "", + "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.DynamicValueMaterialSlot", @@ -1951,6 +2423,21 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "5645f9c3948b417c98606e211bc8a990", + "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_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", @@ -2132,6 +2619,40 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.RedirectNodeData", + "m_ObjectId": "5d480c1b2a08460bb3c57ddcc8efdc05", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Redirect Node", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1108.0, + "y": 641.0000610351563, + "width": 56.000003814697269, + "height": 24.000001907348634 + } + }, + "m_Slots": [ + { + "m_Id": "f24a08f331dc4f59aefc2dc4f63785fa" + }, + { + "m_Id": "f59b753b715d4e6c85db60b9806125f7" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", @@ -2272,9 +2793,9 @@ "m_Guid": { "m_GuidSerialized": "6578b8f6-44ef-45ac-b645-75de3cbb5825" }, - "m_Name": "Emission", + "m_Name": "EmissionColor", "m_DefaultReferenceName": "Color_6D56F0DB", - "m_OverrideReferenceName": "_Emission", + "m_OverrideReferenceName": "_EmissionColor", "m_GeneratePropertyBlock": true, "m_Precision": 0, "overrideHLSLDeclaration": false, @@ -2366,6 +2887,30 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "66c974a394bc4901ae763013d5381d24", + "m_Id": 2, + "m_DisplayName": "False", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "False", + "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.Vector2MaterialSlot", @@ -2720,9 +3265,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2345.999755859375, - "y": 1102.0, - "width": 139.0, + "x": -2216.0, + "y": 1104.0, + "width": 136.0, "height": 34.0 } }, @@ -2788,35 +3333,25 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.PropertyNode", - "m_ObjectId": "8962216feea02482acd951e3e9d27b74", - "m_Group": { - "m_Id": "" + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "89e1b1921bfb4717be5d0344b5bbe3d9", + "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_Name": "Property", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -915.0, - "y": 664.0, - "width": 125.0, - "height": 34.0 - } - }, - "m_Slots": [ - { - "m_Id": "f0dc0d0ca1367e848fd4cc546bc3abfb" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_Property": { - "m_Id": "647973c6b9d7d08e89b6831ff21aaaf0" + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 } } @@ -2837,6 +3372,54 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "8ca595ec72eb4838a8533db06de78ac4", + "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.BlockNode", @@ -2909,6 +3492,60 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode", + "m_ObjectId": "92287c7ffb304016a4e2aba3b2bb3375", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Sample Texture 2D", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -2063.0, + "y": 1335.0, + "width": 184.0, + "height": 253.0 + } + }, + "m_Slots": [ + { + "m_Id": "104b373985bd49ceb0616fac799e31af" + }, + { + "m_Id": "0b03a0b7ea6446c68027c3caa6382c28" + }, + { + "m_Id": "cab4b39ca14f4b4b8040c90d6e58d609" + }, + { + "m_Id": "2537379ba277494c89e48156207a7eb6" + }, + { + "m_Id": "5645f9c3948b417c98606e211bc8a990" + }, + { + "m_Id": "d38c96738324480db0772092e35f8153" + }, + { + "m_Id": "d4fc12e4b0eb45e68646c924a0f18d69" + }, + { + "m_Id": "b259a30e31c747919a4390f36134ec3c" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_TextureType": 0, + "m_NormalMapSpace": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.RedirectNodeData", @@ -3160,6 +3797,40 @@ "m_Modifiable": true } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "a371ce2e9d97463d96d814a45413df53", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1633.0001220703125, + "y": 1464.0001220703125, + "width": 155.00001525878907, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "0fa26f900f0f4b0c9b3f7d9bb219396e" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "647973c6b9d7d08e89b6831ff21aaaf0" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -3386,10 +4057,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -753.0, - "y": 824.0, - "width": 200.0, - "height": 41.0 + "x": -751.0000610351563, + "y": 796.0, + "width": 200.00001525878907, + "height": 41.000003814697269 } }, "m_Slots": [ @@ -3548,6 +4219,18 @@ "m_StageCapability": 3 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", + "m_ObjectId": "b259a30e31c747919a4390f36134ec3c", + "m_Id": 3, + "m_DisplayName": "Sampler", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Sampler", + "m_StageCapability": 3 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -3563,6 +4246,24 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Internal.BooleanShaderProperty", + "m_ObjectId": "b7cccfd432284353869549494c4a2adb", + "m_Guid": { + "m_GuidSerialized": "1fcfabfb-cee2-4fcf-9519-765fa3da0588" + }, + "m_Name": "UseEmissionMap", + "m_DefaultReferenceName": "Boolean_b7cccfd432284353869549494c4a2adb", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 2, + "m_Hidden": false, + "m_Value": false +} + { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", @@ -3873,6 +4574,21 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "cab4b39ca14f4b4b8040c90d6e58d609", + "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_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", @@ -4004,6 +4720,54 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "d0111f047ee04e60b7ec04d5e7e5223b", + "m_Id": 1, + "m_DisplayName": "", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "", + "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", @@ -4093,6 +4857,35 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", + "m_ObjectId": "d2e0f4873a6443418d3db806e84cf902", + "m_Id": 0, + "m_DisplayName": "EmissionMap", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "d38c96738324480db0772092e35f8153", + "m_Id": 1, + "m_DisplayName": "Texture", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Texture", + "m_StageCapability": 3, + "m_Texture": { + "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "m_DefaultType": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -4110,6 +4903,28 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", + "m_ObjectId": "d4fc12e4b0eb45e68646c924a0f18d69", + "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.Vector1MaterialSlot", @@ -4125,6 +4940,54 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "d840bcba069d4e31a2dcf7ab4b17ac45", + "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.DynamicValueMaterialSlot", @@ -4608,10 +5471,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -752.0, - "y": 660.0, - "width": 200.0, - "height": 41.0 + "x": -751.0000610351563, + "y": 829.0, + "width": 200.00001525878907, + "height": 41.000003814697269 } }, "m_Slots": [ @@ -4716,6 +5579,69 @@ "m_SerializedDescriptor": "SurfaceDescription.Alpha" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BranchNode", + "m_ObjectId": "ee7ebc9064514e86b632c9d98e3c4530", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Branch", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1655.0, + "y": 1311.0, + "width": 172.00001525878907, + "height": 142.0 + } + }, + "m_Slots": [ + { + "m_Id": "3d3cb86bffaa4480b39cc4e90a5aaf8d" + }, + { + "m_Id": "39f876d9e6b64449b86f4cd45ca20e7e" + }, + { + "m_Id": "66c974a394bc4901ae763013d5381d24" + }, + { + "m_Id": "89e1b1921bfb4717be5d0344b5bbe3d9" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", + "m_ObjectId": "ef585cca41ba4bd3858cb09898ac8d26", + "m_Guid": { + "m_GuidSerialized": "b8c76c8e-26fd-4144-8fd2-c1092633e2f0" + }, + "m_Name": "EmissionMap", + "m_DefaultReferenceName": "Texture2D_ef585cca41ba4bd3858cb09898ac8d26", + "m_OverrideReferenceName": "_EmissionMap", + "m_GeneratePropertyBlock": true, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "m_Modifiable": true, + "m_DefaultType": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Texture2DArrayInputMaterialSlot", @@ -4821,31 +5747,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", - "m_ObjectId": "f0dc0d0ca1367e848fd4cc546bc3abfb", - "m_Id": 0, - "m_DisplayName": "Emission", - "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": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector4ShaderProperty", @@ -4886,6 +5787,64 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "f24a08f331dc4f59aefc2dc4f63785fa", + "m_Id": 0, + "m_DisplayName": "", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "", + "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.RedirectNodeData", + "m_ObjectId": "f3887f1dfdd44b62863c328af70a21ca", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Redirect Node", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1051.0, + "y": 1357.0, + "width": 56.000003814697269, + "height": 24.000001907348634 + } + }, + "m_Slots": [ + { + "m_Id": "4ad66d3b26e34cf3ae0590b434e88512" + }, + { + "m_Id": "d0111f047ee04e60b7ec04d5e7e5223b" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", @@ -4922,6 +5881,30 @@ "m_Space": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "f59b753b715d4e6c85db60b9806125f7", + "m_Id": 1, + "m_DisplayName": "", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "", + "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",