diff --git a/Editor/Scripts/Editor/VA_AnimationBookEditor.cs b/Editor/Scripts/Editor/VA_AnimationBookEditor.cs index 574d08b..935ef47 100644 --- a/Editor/Scripts/Editor/VA_AnimationBookEditor.cs +++ b/Editor/Scripts/Editor/VA_AnimationBookEditor.cs @@ -179,7 +179,9 @@ namespace TAO.VertexAnimation.Editor if (GUILayout.Button("auto fill", EditorStyles.miniButton)) { + Undo.RecordObject(animationBook, "AutoFill"); animationBook.AutoFill(); + EditorUtility.SetDirty(animationBook); } } } @@ -205,10 +207,7 @@ namespace TAO.VertexAnimation.Editor using (new EditorGUI.DisabledScope(true)) { - for (int t = 0; t < texture2DArray.arraySize; t++) - { - EditorGUILayout.PropertyField(texture2DArray.GetArrayElementAtIndex(t), GUIContent.none); - } + EditorGUILayout.PropertyField(texture2DArray); } previewIndex = EditorGUILayout.IntSlider("Preview" ,previewIndex, 0, texture2DArray.arraySize - 1); diff --git a/Runtime/Scripts/VA_AnimationBook.cs b/Runtime/Scripts/VA_AnimationBook.cs index 6b965ca..85ea143 100644 --- a/Runtime/Scripts/VA_AnimationBook.cs +++ b/Runtime/Scripts/VA_AnimationBook.cs @@ -55,6 +55,7 @@ namespace TAO.VertexAnimation for (int i = 0; i < textureGroups.Count; i++) { var t = GetTextures(i).ToArray(); + if (VA_Texture2DArrayUtils.IsValidForTextureArray(t)) { texture2DArray.Add(VA_Texture2DArrayUtils.CreateTextureArray(t, false, textureGroups[i].isLinear, textureGroups[i].wrapMode, textureGroups[i].filterMode, 1, name + textureGroups[i].shaderParamName)); diff --git a/Runtime/Scripts/VA_AnimationLibraryComponentAuthoring.cs b/Runtime/Scripts/VA_AnimationLibraryComponentAuthoring.cs index c83b95d..847f5aa 100644 --- a/Runtime/Scripts/VA_AnimationLibraryComponentAuthoring.cs +++ b/Runtime/Scripts/VA_AnimationLibraryComponentAuthoring.cs @@ -18,7 +18,6 @@ namespace TAO.VertexAnimation { animationLib.animationLibrary.Create(); - // Blob builder to build. using (BlobBuilder blobBuilder = new BlobBuilder(Allocator.Temp)) { diff --git a/Runtime/Scripts/VA_Texture2DArrayUtils.cs b/Runtime/Scripts/VA_Texture2DArrayUtils.cs index 21b1375..a5ee597 100644 --- a/Runtime/Scripts/VA_Texture2DArrayUtils.cs +++ b/Runtime/Scripts/VA_Texture2DArrayUtils.cs @@ -7,16 +7,19 @@ namespace TAO.VertexAnimation public static Texture2DArray CreateTextureArray(Texture2D[] a_textures, bool a_useMipChain, bool a_isLinear, TextureWrapMode a_wrapMode = TextureWrapMode.Repeat, FilterMode a_filterMode = FilterMode.Bilinear, int a_anisoLevel = 1, string a_name = "") { - if(!IsValidForTextureArray(a_textures)) + if(!IsValidForTextureArray(a_textures) || !IsValidCopyTexturePlatform()) { return null; } Texture2DArray textureArray = new Texture2DArray(a_textures[0].width, a_textures[0].height, a_textures.Length, a_textures[0].format, a_useMipChain, a_isLinear); - for (int i = 0; i < a_textures.Length; i++) + if (IsValidCopyTexturePlatform()) { - Graphics.CopyTexture(a_textures[i], 0, 0, textureArray, i, 0); + for (int i = 0; i < a_textures.Length; i++) + { + Graphics.CopyTexture(a_textures[i], 0, 0, textureArray, i, 0); + } } textureArray.wrapMode = a_wrapMode; @@ -56,9 +59,47 @@ namespace TAO.VertexAnimation Debug.LogError("Texture " + a_textures[i].name + " has a different format/graphics format!"); return false; } + + if (!a_textures[0].isReadable) + { +#if UNITY_EDITOR + Debug.LogWarning("Texture " + a_textures[i].name + " is not readable!"); + return true; +#else + Debug.LogError("Texture " + a_textures[i].name + " is not readable!"); + return false; +#endif + } } return true; } + + public static bool IsValidCopyTexturePlatform() + { + switch (SystemInfo.copyTextureSupport) + { + case UnityEngine.Rendering.CopyTextureSupport.None: + Debug.LogError("No CopyTextureSupport on this platform!"); + return false; + case UnityEngine.Rendering.CopyTextureSupport.Basic: + return true; + case UnityEngine.Rendering.CopyTextureSupport.Copy3D: + return true; + case UnityEngine.Rendering.CopyTextureSupport.DifferentTypes: + return true; + case UnityEngine.Rendering.CopyTextureSupport.TextureToRT: + return true; + case UnityEngine.Rendering.CopyTextureSupport.RTToTexture: + return true; + default: +#if UNITY_EDITOR + return true; +#else + Debug.LogError("No CopyTextureSupport on this platform!"); + return false; +#endif + } + } } } \ No newline at end of file diff --git a/Runtime/Shaders/SubGraphs/SampleTexture2dArrayLOD.shadersubgraph b/Runtime/Shaders/SubGraphs/SampleTexture2dArrayLOD.shadersubgraph index b0e8365..0c024f8 100644 --- a/Runtime/Shaders/SubGraphs/SampleTexture2dArrayLOD.shadersubgraph +++ b/Runtime/Shaders/SubGraphs/SampleTexture2dArrayLOD.shadersubgraph @@ -182,6 +182,7 @@ "m_Id": "3e4d522c290842969d37626d90937b59" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -199,7 +200,6 @@ "m_Id": 0, "m_DisplayName": "Index", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -248,6 +248,7 @@ "m_Id": "f6f46ec323d94a088f47d6ed87a8560e" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -266,7 +267,6 @@ "m_Id": 0, "m_DisplayName": "SamplerState", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3 @@ -279,7 +279,6 @@ "m_Id": 1, "m_DisplayName": "RGBA", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "RGBA", "m_StageCapability": 3, @@ -294,7 +293,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_Labels": [] } { @@ -309,7 +309,8 @@ "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"textureArray\":{\"instanceID\":0}}", @@ -341,6 +342,7 @@ "m_Id": "87be4a5d04ff4012b150c8d7e9e970f9" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -358,7 +360,6 @@ "m_Id": 4, "m_DisplayName": "Index", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Index", "m_StageCapability": 3, @@ -392,6 +393,7 @@ "m_Id": "d127f4bc74d14171b956d138cacb9893" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -409,7 +411,6 @@ "m_Id": 2, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -428,7 +429,7 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "67550e6ee3cc4f93917d5f97c2ab01a7", "m_Guid": { @@ -439,7 +440,8 @@ "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.0, "m_FloatType": 0, @@ -450,7 +452,7 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "6c228c0694f148038c732bcc5395679d", "m_Guid": { @@ -461,7 +463,8 @@ "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.0, "m_FloatType": 0, @@ -478,7 +481,6 @@ "m_Id": 3, "m_DisplayName": "Sampler", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Sampler", "m_StageCapability": 3 @@ -491,7 +493,6 @@ "m_Id": 0, "m_DisplayName": "TextureArray", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "TextureArray", "m_StageCapability": 3, @@ -508,7 +509,6 @@ "m_Id": 0, "m_DisplayName": "UV", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -527,7 +527,7 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector2ShaderProperty", "m_ObjectId": "8e06a56cd1e244f197e6c9bd75a8474a", "m_Guid": { @@ -538,7 +538,8 @@ "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "x": 0.0, @@ -560,7 +561,8 @@ "m_OverrideReferenceName": "SamplerState_Linear_Repeat", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_filter": 0, @@ -575,7 +577,6 @@ "m_Id": 0, "m_DisplayName": "Texture2D Array", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3 @@ -604,6 +605,7 @@ "m_Id": "ba8b8ce0934d473eb1e921e11b4a358f" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -637,6 +639,7 @@ "m_Id": "4a5cf08366814dfbb54e1ab1eacf2e33" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -652,7 +655,6 @@ "m_Id": 0, "m_DisplayName": "LOD", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -686,6 +688,7 @@ "m_Id": "3739175e78cb4b10997f85da1fa4dd08" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -703,7 +706,6 @@ "m_Id": 1, "m_DisplayName": "RGBA", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "RGBA", "m_StageCapability": 3, @@ -718,7 +720,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_Labels": [] } { @@ -728,7 +731,6 @@ "m_Id": 5, "m_DisplayName": "LOD", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "LOD", "m_StageCapability": 3, diff --git a/Runtime/Shaders/SubGraphs/VA.shadersubgraph b/Runtime/Shaders/SubGraphs/VA.shadersubgraph index 8efa616..8033f1d 100644 --- a/Runtime/Shaders/SubGraphs/VA.shadersubgraph +++ b/Runtime/Shaders/SubGraphs/VA.shadersubgraph @@ -199,6 +199,7 @@ "m_Id": "68e1750097114f2d9801fda29c1a4a1a" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -214,7 +215,6 @@ "m_Id": 0, "m_DisplayName": "Time", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -237,7 +237,8 @@ "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", @@ -254,7 +255,6 @@ "m_Id": 1, "m_DisplayName": "texSampler", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "texSampler", "m_StageCapability": 3 @@ -283,6 +283,7 @@ "m_Id": "23a471ed9f794edb8e8bd66a5f65451e" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -316,6 +317,7 @@ "m_Id": "91fad60529a14d678005224cfbac1b50" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -333,7 +335,6 @@ "m_Id": 0, "m_DisplayName": "SamplerState", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3 @@ -362,6 +363,7 @@ "m_Id": "ffcaa3e5c6a5468c92d6d08c301a6f59" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -379,7 +381,6 @@ "m_Id": 2, "m_DisplayName": "Alpha", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Alpha", "m_StageCapability": 3, @@ -407,7 +408,6 @@ "m_Id": 0, "m_DisplayName": "uvIndex", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "uvIndex", "m_StageCapability": 3, @@ -466,6 +466,7 @@ "m_Id": "f3afc10b499a42c4bbcd332b713c9635" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -484,7 +485,6 @@ "m_Id": 0, "m_DisplayName": "UV", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -503,7 +503,7 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "967e0c2bcb6e48c2b85b82c6d4c734a4", "m_Guid": { @@ -514,7 +514,8 @@ "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.0, "m_FloatType": 0, @@ -536,7 +537,8 @@ "m_OverrideReferenceName": "SamplerState_Linear_Repeat", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_filter": 0, @@ -545,7 +547,7 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector2ShaderProperty", "m_ObjectId": "a09a6ce7e08545d99b5bda70586f4e79", "m_Guid": { @@ -556,7 +558,8 @@ "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "x": 0.0, @@ -573,7 +576,6 @@ "m_Id": 0, "m_DisplayName": "MaxFrames", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -591,7 +593,6 @@ "m_Id": 1, "m_DisplayName": "Position", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Position", "m_StageCapability": 3, @@ -635,6 +636,7 @@ "m_Id": "b23754f8d4404c9cb59d3879708464ad" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -652,7 +654,6 @@ "m_Id": 4, "m_DisplayName": "time", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "time", "m_StageCapability": 3, @@ -670,7 +671,6 @@ "m_Id": 2, "m_DisplayName": "positionMap", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "positionMap", "m_StageCapability": 3, @@ -688,7 +688,6 @@ "m_Id": 6, "m_DisplayName": "maxFrames", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "maxFrames", "m_StageCapability": 3, @@ -706,7 +705,6 @@ "m_Id": 9, "m_DisplayName": "position", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "position", "m_StageCapability": 3, @@ -750,6 +748,7 @@ "m_Id": "4820d64a797d4948a129f455b98feed8" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -767,7 +766,6 @@ "m_Id": 10, "m_DisplayName": "alpha", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "alpha", "m_StageCapability": 3, @@ -789,7 +787,7 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "f9b649ed28584dca8a522f3fb582f350", "m_Guid": { @@ -800,7 +798,8 @@ "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.0, "m_FloatType": 0, @@ -817,7 +816,6 @@ "m_Id": 0, "m_DisplayName": "PositionMap", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3 diff --git a/Runtime/Shaders/SubGraphs/VA_ARRAY.shadersubgraph b/Runtime/Shaders/SubGraphs/VA_ARRAY.shadersubgraph index 84365b5..9a56504 100644 --- a/Runtime/Shaders/SubGraphs/VA_ARRAY.shadersubgraph +++ b/Runtime/Shaders/SubGraphs/VA_ARRAY.shadersubgraph @@ -219,6 +219,7 @@ "m_Id": "7106fc4a9e6e4a0a8bdd678ceb7f4f1c" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -234,7 +235,6 @@ "m_Id": 0, "m_DisplayName": "Time", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -252,7 +252,6 @@ "m_Id": 1, "m_DisplayName": "texSampler", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "texSampler", "m_StageCapability": 3 @@ -281,6 +280,7 @@ "m_Id": "23a471ed9f794edb8e8bd66a5f65451e" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -314,6 +314,7 @@ "m_Id": "91fad60529a14d678005224cfbac1b50" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -331,7 +332,6 @@ "m_Id": 0, "m_DisplayName": "SamplerState", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3 @@ -344,7 +344,6 @@ "m_Id": 0, "m_DisplayName": "PositionMapIndex", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -362,7 +361,6 @@ "m_Id": 2, "m_DisplayName": "Alpha", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Alpha", "m_StageCapability": 3, @@ -390,7 +388,6 @@ "m_Id": 0, "m_DisplayName": "uvIndex", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "uvIndex", "m_StageCapability": 3, @@ -452,6 +449,7 @@ "m_Id": "c1454b74eac5469eb14d403b66a8283a" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -470,7 +468,6 @@ "m_Id": 0, "m_DisplayName": "UV", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -489,7 +486,7 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "967e0c2bcb6e48c2b85b82c6d4c734a4", "m_Guid": { @@ -500,7 +497,8 @@ "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.0, "m_FloatType": 0, @@ -522,7 +520,8 @@ "m_OverrideReferenceName": "SamplerState_Linear_Repeat", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_filter": 0, @@ -531,7 +530,7 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector2ShaderProperty", "m_ObjectId": "a09a6ce7e08545d99b5bda70586f4e79", "m_Guid": { @@ -542,7 +541,8 @@ "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "x": 0.0, @@ -559,7 +559,6 @@ "m_Id": 11, "m_DisplayName": "positionMapIndex", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "positionMapIndex", "m_StageCapability": 3, @@ -577,7 +576,6 @@ "m_Id": 0, "m_DisplayName": "MaxFrames", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -595,7 +593,6 @@ "m_Id": 1, "m_DisplayName": "Position", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Position", "m_StageCapability": 3, @@ -639,6 +636,7 @@ "m_Id": "b23754f8d4404c9cb59d3879708464ad" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -656,7 +654,6 @@ "m_Id": 2, "m_DisplayName": "positionMap", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "positionMap", "m_StageCapability": 3, @@ -673,7 +670,6 @@ "m_Id": 10, "m_DisplayName": "alpha", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "alpha", "m_StageCapability": 3, @@ -701,7 +697,6 @@ "m_Id": 4, "m_DisplayName": "time", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "time", "m_StageCapability": 3, @@ -719,7 +714,6 @@ "m_Id": 9, "m_DisplayName": "position", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "position", "m_StageCapability": 3, @@ -752,7 +746,8 @@ "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"textureArray\":{\"instanceID\":0}}", @@ -784,6 +779,7 @@ "m_Id": "582d5d344008450caad85abd181be9a5" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -795,7 +791,7 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "cc4eba55004546408c4665cdb22d3111", "m_Guid": { @@ -806,7 +802,8 @@ "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": true, + "overrideHLSLDeclaration": true, + "hlslDeclarationOverride": 3, "m_Hidden": false, "m_Value": 0.0, "m_FloatType": 0, @@ -823,7 +820,6 @@ "m_Id": 0, "m_DisplayName": "PositionMap", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3 @@ -852,6 +848,7 @@ "m_Id": "d24cdb691ca9439aa88c66714545877c" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -869,7 +866,6 @@ "m_Id": 6, "m_DisplayName": "maxFrames", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "maxFrames", "m_StageCapability": 3, @@ -903,6 +899,7 @@ "m_Id": "4820d64a797d4948a129f455b98feed8" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -914,7 +911,7 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "f9b649ed28584dca8a522f3fb582f350", "m_Guid": { @@ -925,7 +922,8 @@ "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.0, "m_FloatType": 0, diff --git a/Runtime/Shaders/SubGraphs/VectorEncodingDecoding/Decode2Vector1ToVector3.shadersubgraph b/Runtime/Shaders/SubGraphs/VectorEncodingDecoding/Decode2Vector1ToVector3.shadersubgraph index f83d64d..199970a 100644 --- a/Runtime/Shaders/SubGraphs/VectorEncodingDecoding/Decode2Vector1ToVector3.shadersubgraph +++ b/Runtime/Shaders/SubGraphs/VectorEncodingDecoding/Decode2Vector1ToVector3.shadersubgraph @@ -102,6 +102,7 @@ "m_Id": "9d0a22c11f7347cf85910e670a28a7b2" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -117,7 +118,6 @@ "m_Id": 0, "m_DisplayName": "Vector1", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -135,7 +135,6 @@ "m_Id": 1, "m_DisplayName": "vector3", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "vector3", "m_StageCapability": 3, @@ -163,7 +162,6 @@ "m_Id": 0, "m_DisplayName": "vector1", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "vector1", "m_StageCapability": 3, @@ -181,7 +179,6 @@ "m_Id": 1, "m_DisplayName": "Vector3", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector3", "m_StageCapability": 3, @@ -225,6 +222,7 @@ "m_Id": "121791ffa91b4ae087bcb644cd91a09b" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -236,7 +234,7 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "c7aa86a194644e57b07408803b64ebd7", "m_Guid": { @@ -247,7 +245,8 @@ "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.0, "m_FloatType": 0, @@ -283,6 +282,7 @@ "m_Id": "206320e6a1984736b1513c9eed70af22" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, "m_CustomColors": { diff --git a/Runtime/Shaders/SubGraphs/VectorEncodingDecoding/DecodeFloatToFloat3.shadersubgraph b/Runtime/Shaders/SubGraphs/VectorEncodingDecoding/DecodeFloatToFloat3.shadersubgraph index 100bc80..4886d86 100644 --- a/Runtime/Shaders/SubGraphs/VectorEncodingDecoding/DecodeFloatToFloat3.shadersubgraph +++ b/Runtime/Shaders/SubGraphs/VectorEncodingDecoding/DecodeFloatToFloat3.shadersubgraph @@ -120,7 +120,6 @@ "m_Id": 1, "m_DisplayName": "Vector3", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector3", "m_StageCapability": 3, @@ -148,7 +147,6 @@ "m_Id": 0, "m_DisplayName": "f1", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "f1", "m_StageCapability": 3, @@ -166,7 +164,6 @@ "m_Id": 1, "m_DisplayName": "f3", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "f3", "m_StageCapability": 3, @@ -213,6 +210,7 @@ "m_Id": "e5b6dcbec075435fbc9af85799fe6420" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -231,7 +229,6 @@ "m_Id": 0, "m_DisplayName": "f1", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "f1", "m_StageCapability": 3, @@ -268,6 +265,7 @@ "m_Id": "7c8b7afd842e45a5960396a7de8d42f0" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -280,7 +278,7 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "771ac3b08a1144b086078a0d07c220da", "m_Guid": { @@ -291,7 +289,8 @@ "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.23919999599456788, "m_FloatType": 0, @@ -308,7 +307,6 @@ "m_Id": 1, "m_DisplayName": "f3", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "f3", "m_StageCapability": 3, @@ -355,6 +353,7 @@ "m_Id": "124ded35cbdf4fa58367d2a2bf5374dc" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -389,6 +388,7 @@ "m_Id": "0cba0cf553074658b7a3602d4d7e647a" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -420,6 +420,7 @@ "m_Id": "f2355e12360c41d8be5dbcb32f44c13d" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -437,7 +438,6 @@ "m_Id": 1, "m_DisplayName": "f2", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "f2", "m_StageCapability": 3, @@ -462,7 +462,6 @@ "m_Id": 0, "m_DisplayName": "f2 (1)", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "f2", "m_StageCapability": 3, @@ -487,7 +486,6 @@ "m_Id": 0, "m_DisplayName": "Vector1", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, diff --git a/Runtime/Shaders/SubGraphs/VectorEncodingDecoding/DecodeVector1ToVector3.shadersubgraph b/Runtime/Shaders/SubGraphs/VectorEncodingDecoding/DecodeVector1ToVector3.shadersubgraph index ad259e7..cb968bc 100644 --- a/Runtime/Shaders/SubGraphs/VectorEncodingDecoding/DecodeVector1ToVector3.shadersubgraph +++ b/Runtime/Shaders/SubGraphs/VectorEncodingDecoding/DecodeVector1ToVector3.shadersubgraph @@ -102,6 +102,7 @@ "m_Id": "9d0a22c11f7347cf85910e670a28a7b2" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -117,7 +118,6 @@ "m_Id": 0, "m_DisplayName": "Vector1", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -135,7 +135,6 @@ "m_Id": 1, "m_DisplayName": "f3", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "f3", "m_StageCapability": 3, @@ -163,7 +162,6 @@ "m_Id": 1, "m_DisplayName": "Vector3", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector3", "m_StageCapability": 3, @@ -207,6 +205,7 @@ "m_Id": "121791ffa91b4ae087bcb644cd91a09b" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -218,7 +217,7 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "c7aa86a194644e57b07408803b64ebd7", "m_Guid": { @@ -229,7 +228,8 @@ "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.0, "m_FloatType": 0, @@ -265,6 +265,7 @@ "m_Id": "848145a6436e4e8aba88f8ef1a124b78" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, "m_CustomColors": { @@ -283,7 +284,6 @@ "m_Id": 0, "m_DisplayName": "f1", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "f1", "m_StageCapability": 3, diff --git a/Runtime/Shaders/SubGraphs/VectorEncodingDecoding/Encode2Vector3ToVector1.shadersubgraph b/Runtime/Shaders/SubGraphs/VectorEncodingDecoding/Encode2Vector3ToVector1.shadersubgraph index ed3300e..a3a40e2 100644 --- a/Runtime/Shaders/SubGraphs/VectorEncodingDecoding/Encode2Vector3ToVector1.shadersubgraph +++ b/Runtime/Shaders/SubGraphs/VectorEncodingDecoding/Encode2Vector3ToVector1.shadersubgraph @@ -102,6 +102,7 @@ "m_Id": "da67a8cccc5e47829fbfcf50aead1f3e" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -119,7 +120,6 @@ "m_Id": 1, "m_DisplayName": "Vector1", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector1", "m_StageCapability": 3, @@ -137,7 +137,6 @@ "m_Id": 1, "m_DisplayName": "vector3", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "vector3", "m_StageCapability": 3, @@ -184,6 +183,7 @@ "m_Id": "af9842cba20446ec90d8a3d622f30915" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, "m_CustomColors": { @@ -202,7 +202,6 @@ "m_Id": 0, "m_DisplayName": "vector1", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "vector1", "m_StageCapability": 3, @@ -220,7 +219,6 @@ "m_Id": 0, "m_DisplayName": "Vector3", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -264,6 +262,7 @@ "m_Id": "285ef83ab3394450b82148d63dacc74d" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -273,7 +272,7 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector3ShaderProperty", "m_ObjectId": "f4f17c3262704090a48f16ca7b479fe2", "m_Guid": { @@ -284,7 +283,8 @@ "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "x": 1.0, diff --git a/Runtime/Shaders/SubGraphs/VectorEncodingDecoding/EncodeFloat3ToFloat.shadersubgraph b/Runtime/Shaders/SubGraphs/VectorEncodingDecoding/EncodeFloat3ToFloat.shadersubgraph index 6026f00..66ff9d2 100644 --- a/Runtime/Shaders/SubGraphs/VectorEncodingDecoding/EncodeFloat3ToFloat.shadersubgraph +++ b/Runtime/Shaders/SubGraphs/VectorEncodingDecoding/EncodeFloat3ToFloat.shadersubgraph @@ -139,6 +139,7 @@ "m_Id": "38ea28ce1d2946939f8da8a5a13dc271" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -157,7 +158,6 @@ "m_Id": 0, "m_DisplayName": "f2", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "f2", "m_StageCapability": 3, @@ -182,7 +182,6 @@ "m_Id": 1, "m_DisplayName": "Vector1", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector1", "m_StageCapability": 3, @@ -200,7 +199,6 @@ "m_Id": 0, "m_DisplayName": "f3", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "f3", "m_StageCapability": 3, @@ -228,7 +226,6 @@ "m_Id": 1, "m_DisplayName": "f1", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "f1", "m_StageCapability": 3, @@ -246,7 +243,6 @@ "m_Id": 1, "m_DisplayName": "f1", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "f1", "m_StageCapability": 3, @@ -283,6 +279,7 @@ "m_Id": "6083c1c5cfdb43a2b860d11819e18fee" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -301,7 +298,6 @@ "m_Id": 0, "m_DisplayName": "f3", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "f3", "m_StageCapability": 3, @@ -345,6 +341,7 @@ "m_Id": "7b566bab9e1642b086248d23e428a2db" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -356,7 +353,7 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector3ShaderProperty", "m_ObjectId": "649381b2fbd64c65a3573245a307b86b", "m_Guid": { @@ -367,7 +364,8 @@ "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "x": 0.5, @@ -384,7 +382,6 @@ "m_Id": 0, "m_DisplayName": "Vector3", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -431,6 +428,7 @@ "m_Id": "3c2ce541348040bc84f367711eef6b0b" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -465,6 +463,7 @@ "m_Id": "3a65985af2a3458999edd07eb7e7f94a" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -480,7 +479,6 @@ "m_Id": 1, "m_DisplayName": "f2", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "f2", "m_StageCapability": 3, diff --git a/Runtime/Shaders/SubGraphs/VectorEncodingDecoding/EncodeVector3ToVector1.shadersubgraph b/Runtime/Shaders/SubGraphs/VectorEncodingDecoding/EncodeVector3ToVector1.shadersubgraph index 7c57fe8..9360448 100644 --- a/Runtime/Shaders/SubGraphs/VectorEncodingDecoding/EncodeVector3ToVector1.shadersubgraph +++ b/Runtime/Shaders/SubGraphs/VectorEncodingDecoding/EncodeVector3ToVector1.shadersubgraph @@ -394,6 +394,7 @@ "m_Id": "142f11473b6d48d18151ced80fb6c8d6" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -430,6 +431,7 @@ "m_Id": "38e297b0b734402e80e6e5ce405a0f4a" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, "m_CustomColors": { @@ -460,6 +462,7 @@ "m_Id": "da67a8cccc5e47829fbfcf50aead1f3e" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -477,7 +480,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -502,7 +504,6 @@ "m_Id": 4, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -520,7 +521,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -567,6 +567,7 @@ "m_Id": "6fa0742c26024cfba6c33bf1745daf6f" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, "m_CustomColors": { @@ -581,7 +582,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -630,7 +630,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -677,6 +676,7 @@ "m_Id": "0fbe52349e8344ce89528eb6a09d642f" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, "m_CustomColors": { @@ -691,7 +691,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -716,7 +715,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -763,6 +761,7 @@ "m_Id": "3358e7304636494dbeac96f60de989ff" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, "m_CustomColors": { @@ -777,7 +776,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -802,7 +800,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -827,7 +824,6 @@ "m_Id": 1, "m_DisplayName": "Vector1", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector1", "m_StageCapability": 3, @@ -845,7 +841,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -894,7 +889,6 @@ "m_Id": 1, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -919,7 +913,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -966,6 +959,7 @@ "m_Id": "2f914fdfaa1441fb9e14331b2455b9d1" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, "m_CustomColors": { @@ -980,7 +974,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1051,6 +1044,7 @@ "m_Id": "154a4bdf6f6f4ac8a91f9961bb654bb5" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, "m_CustomColors": { @@ -1065,7 +1059,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1114,7 +1107,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -1139,7 +1131,6 @@ "m_Id": 2, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 3, @@ -1157,7 +1148,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -1206,7 +1196,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -1231,7 +1220,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -1256,7 +1244,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1305,7 +1292,6 @@ "m_Id": 1, "m_DisplayName": "vector3", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "vector3", "m_StageCapability": 3, @@ -1355,6 +1341,7 @@ "m_Id": "e0b9d53426a44e0ab72ffc36ebbfc680" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, "m_CustomColors": { @@ -1369,7 +1356,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -1394,7 +1380,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -1441,6 +1426,7 @@ "m_Id": "6fd3b8493a504f08bcd4a4e767a75c9d" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, "m_CustomColors": { @@ -1455,7 +1441,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1480,7 +1465,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1505,7 +1489,6 @@ "m_Id": 3, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -1523,7 +1506,6 @@ "m_Id": 1, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1548,7 +1530,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -1573,7 +1554,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -1617,6 +1597,7 @@ "m_Id": "af9842cba20446ec90d8a3d622f30915" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, "m_CustomColors": { @@ -1635,7 +1616,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -1703,6 +1683,7 @@ "m_Id": "2bcb4e57495a4e3d90ffb1e947336c60" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, "m_CustomColors": { @@ -1717,7 +1698,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -1788,6 +1768,7 @@ "m_Id": "b329d90c32724616ab8cef533b8c890a" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, "m_CustomColors": { @@ -1802,7 +1783,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -1846,6 +1826,7 @@ "m_Id": "72ed8379d63c4fae943a5e21d17b10cb" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, "m_CustomColors": { @@ -1860,7 +1841,6 @@ "m_Id": 1, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 3, @@ -1878,7 +1858,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -1927,7 +1906,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -1974,6 +1952,7 @@ "m_Id": "153ec0974a084bebb0d99802d32acb27" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, "m_CustomColors": { @@ -1988,7 +1967,6 @@ "m_Id": 0, "m_DisplayName": "vector1", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "vector1", "m_StageCapability": 3, @@ -2006,7 +1984,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2031,7 +2008,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -2080,7 +2056,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -2105,7 +2080,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -2130,7 +2104,6 @@ "m_Id": 0, "m_DisplayName": "Vector3", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2158,7 +2131,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -2207,7 +2179,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2232,7 +2203,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -2279,6 +2249,7 @@ "m_Id": "43ac165f5a07415aa65b8cf08ccda1c8" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, "m_CustomColors": { @@ -2309,6 +2280,7 @@ "m_Id": "285ef83ab3394450b82148d63dacc74d" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -2318,7 +2290,7 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector3ShaderProperty", "m_ObjectId": "f4f17c3262704090a48f16ca7b479fe2", "m_Guid": { @@ -2329,7 +2301,8 @@ "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "x": 1.0, @@ -2346,7 +2319,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, diff --git a/Tests/Runtime/Shaders/EncodeDecodeTest.shadergraph b/Tests/Runtime/Shaders/EncodeDecodeTest.shadergraph index d9bdc0c..ce3ebf4 100644 --- a/Tests/Runtime/Shaders/EncodeDecodeTest.shadergraph +++ b/Tests/Runtime/Shaders/EncodeDecodeTest.shadergraph @@ -333,7 +333,6 @@ "m_Id": -1980518314, "m_DisplayName": "Vector3", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector3_f4f17c3262704090a48f16ca7b479fe2", "m_StageCapability": 3, @@ -361,7 +360,6 @@ "m_Id": 1, "m_DisplayName": "In Min Max", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "InMinMax", "m_StageCapability": 3, @@ -405,6 +403,7 @@ "m_Id": "0884a90f50dc44ddb78d7e1c4ad776d0" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -426,7 +425,6 @@ "m_Id": 1, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -451,7 +449,6 @@ "m_Id": 1, "m_DisplayName": "Vector1", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector1", "m_StageCapability": 3, @@ -485,6 +482,7 @@ "m_Id": "7a874a28519b4c10a408a499f4c55ce1" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -525,6 +523,7 @@ "m_Id": "ee2a3740b1bf4d35b2e211865315edf2" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -539,7 +538,6 @@ "m_Id": 1, "m_DisplayName": "Vector3", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector3", "m_StageCapability": 3, @@ -583,6 +581,7 @@ "m_Id": "ee6964bff24a49dc98ef6a44d0e4b309" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -600,7 +599,6 @@ "m_Id": 3, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -644,6 +642,7 @@ "m_Id": "b04e81093dfc4331a8aa10d07adfc87d" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -665,7 +664,6 @@ "m_Id": 0, "m_DisplayName": "Ambient Occlusion", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Occlusion", "m_StageCapability": 2, @@ -699,6 +697,7 @@ "m_Id": "89b6132a033a4478adc2751322b88f9f" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -708,7 +707,7 @@ } { - "m_SGVersion": 1, + "m_SGVersion": 3, "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", "m_ObjectId": "396ac41a621a4617b55c24f56d4cc880", "m_Guid": { @@ -719,7 +718,8 @@ "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "r": 0.8588235378265381, @@ -737,7 +737,6 @@ "m_Id": 1, "m_DisplayName": "Vector3", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector3", "m_StageCapability": 3, @@ -765,7 +764,6 @@ "m_Id": 1192378022, "m_DisplayName": "Vector1", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector1_c7aa86a194644e57b07408803b64ebd7", "m_StageCapability": 3, @@ -783,7 +781,6 @@ "m_Id": 1, "m_DisplayName": "Vector1", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector1", "m_StageCapability": 3, @@ -817,6 +814,7 @@ "m_Id": "de5ca7df3abe41faad1a2c21e0992e6f" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -832,7 +830,6 @@ "m_Id": -1980518314, "m_DisplayName": "Vector3", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector3_f4f17c3262704090a48f16ca7b479fe2", "m_StageCapability": 3, @@ -860,7 +857,6 @@ "m_Id": 1192378022, "m_DisplayName": "Vector1", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector1_c7aa86a194644e57b07408803b64ebd7", "m_StageCapability": 3, @@ -878,7 +874,6 @@ "m_Id": 1, "m_DisplayName": "Vector3", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector3", "m_StageCapability": 3, @@ -906,7 +901,6 @@ "m_Id": 0, "m_DisplayName": "Base Color", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "BaseColor", "m_StageCapability": 2, @@ -925,7 +919,13 @@ "Y", "Z" ], - "m_ColorMode": 0 + "m_ColorMode": 0, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } } { @@ -935,7 +935,6 @@ "m_Id": 1, "m_DisplayName": "Vector1", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector1", "m_StageCapability": 3, @@ -972,6 +971,7 @@ "m_Id": "635a135da15845d6bf10300be4077229" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -1014,6 +1014,7 @@ "m_Id": "1b766ed09ef44ab8b0288226230e5eda" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -1051,6 +1052,7 @@ "m_Id": "7ad3926f062d4a2197bda9b588beae38" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -1082,6 +1084,7 @@ "m_Id": "c8ed9e56fa144ad88e703a65cf1f1527" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -1097,7 +1100,6 @@ "m_Id": -1980518314, "m_DisplayName": "Vector3", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector3_f4f17c3262704090a48f16ca7b479fe2", "m_StageCapability": 3, @@ -1141,6 +1143,7 @@ "m_Id": "8af65b4b0110490597f6352b17b54c55" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -1175,6 +1178,7 @@ "m_Id": "5529db94ce71493980a6bcdb26f8bbb1" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -1229,6 +1233,7 @@ "m_Id": "3ce0475c52854d139058a397c6157acd" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -1250,7 +1255,6 @@ "m_Id": 654627568, "m_DisplayName": "Vector1", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector1_771ac3b08a1144b086078a0d07c220da", "m_StageCapability": 3, @@ -1268,7 +1272,6 @@ "m_Id": 1, "m_DisplayName": "In Min Max", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "InMinMax", "m_StageCapability": 3, @@ -1312,6 +1315,7 @@ "m_Id": "06c7350a14b644d6b3168613402c5734" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -1328,7 +1332,6 @@ "m_Id": 0, "m_DisplayName": "Normal", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Normal", "m_StageCapability": 1, @@ -1357,7 +1360,6 @@ "m_Id": 0, "m_DisplayName": "Position", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Position", "m_StageCapability": 1, @@ -1405,6 +1407,7 @@ "m_Id": "f65b9abd9eee46daada7546fa4a60325" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -1426,7 +1429,6 @@ "m_Id": 2, "m_DisplayName": "Out Min Max", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "OutMinMax", "m_StageCapability": 3, @@ -1470,6 +1472,7 @@ "m_Id": "fe4b94f87fda4433967932204acca7b1" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -1491,7 +1494,6 @@ "m_Id": 0, "m_DisplayName": "Normal (Tangent Space)", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "NormalTS", "m_StageCapability": 2, @@ -1520,7 +1522,6 @@ "m_Id": 0, "m_DisplayName": "Smoothness", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Smoothness", "m_StageCapability": 2, @@ -1538,7 +1539,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -1563,7 +1563,6 @@ "m_Id": 654627568, "m_DisplayName": "Vector1", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector1_771ac3b08a1144b086078a0d07c220da", "m_StageCapability": 3, @@ -1597,6 +1596,7 @@ "m_Id": "30b3823d11e048fc9e746a4614c81573" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -1628,6 +1628,7 @@ "m_Id": "b85d9b83d37a469c86256fc439124cef" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -1643,7 +1644,6 @@ "m_Id": 1, "m_DisplayName": "Vector3", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector3", "m_StageCapability": 3, @@ -1671,7 +1671,6 @@ "m_Id": 2, "m_DisplayName": "Out Min Max", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "OutMinMax", "m_StageCapability": 3, @@ -1696,7 +1695,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -1721,7 +1719,6 @@ "m_Id": 0, "m_DisplayName": "Metallic", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Metallic", "m_StageCapability": 2, @@ -1758,6 +1755,7 @@ "m_Id": "f3f4d3efc35c484887ea1c7630a567b7" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -1790,6 +1788,7 @@ "m_Id": "59da5dfc4d8a4ed886a5acf40cb7a014" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -1805,7 +1804,6 @@ "m_Id": 0, "m_DisplayName": "Tangent", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Tangent", "m_StageCapability": 1, @@ -1834,7 +1832,6 @@ "m_Id": 1192378022, "m_DisplayName": "Vector1", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector1_c7aa86a194644e57b07408803b64ebd7", "m_StageCapability": 3, @@ -1852,7 +1849,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -1875,7 +1871,8 @@ "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalLitSubTarget", "m_ObjectId": "db2af5017d444c8c882d7b77c131f7c5", "m_WorkflowMode": 1, - "m_NormalDropOffSpace": 0 + "m_NormalDropOffSpace": 0, + "m_ClearCoat": false } { @@ -1885,7 +1882,6 @@ "m_Id": 0, "m_DisplayName": "Emission", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Emission", "m_StageCapability": 2, @@ -1904,7 +1900,13 @@ "Y", "Z" ], - "m_ColorMode": 1 + "m_ColorMode": 1, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } } { @@ -1914,7 +1916,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -1939,7 +1940,6 @@ "m_Id": -2121885440, "m_DisplayName": "Vector3", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector3_649381b2fbd64c65a3573245a307b86b", "m_StageCapability": 3, @@ -1967,7 +1967,6 @@ "m_Id": 3, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1992,7 +1991,6 @@ "m_Id": 0, "m_DisplayName": "Color", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2007,7 +2005,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_Labels": [] } { @@ -2017,7 +2016,6 @@ "m_Id": 1, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2042,7 +2040,6 @@ "m_Id": 1, "m_DisplayName": "Vector3", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector3", "m_StageCapability": 3, @@ -2089,6 +2086,7 @@ "m_Id": "48267c23c4ae420d86d97c14120cfe04" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -2135,6 +2133,7 @@ "m_Id": "2b1fdb71be734d8e8c0c1e27b03ac371" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -2149,7 +2148,6 @@ "m_Id": 1, "m_DisplayName": "Vector1", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector1", "m_StageCapability": 3, diff --git a/package.json b/package.json index 26ce354..8feafbf 100644 --- a/package.json +++ b/package.json @@ -2,8 +2,8 @@ "name": "com.tech_art_outsource.vertex_animation", "displayName": "TAO Vertex Animation", "version": "0.1.0", - "unity": "2020.1", - "unityRelease": "6f1", + "unity": "2020.2", + "unityRelease": "0f1", "description": "Vertex animation shaders and tools.", "category": "Tool", "type": "tool", @@ -23,5 +23,12 @@ "description": "This sample is just an example", "path": "Samples~/Example1" } - ] + ], + "dependencies": { + "com.unity.entities": "0.16.0-preview.21", + "com.unity.render-pipelines.universal": "10.2.2", + "com.unity.shadergraph": "10.2.2", + "com.unity.rendering.hybrid": "0.10.0-preview.21" + }, + "hideInEditor": false } \ No newline at end of file