From eb0450ce45b4f9adc3e755e28d5a7dde0844e2ac Mon Sep 17 00:00:00 2001 From: max Date: Sun, 27 Dec 2020 18:15:58 +0100 Subject: [PATCH] Samples --- .../Example1/Animations/BaseMeshBook.asset | 202 +++++++++++------- Samples~/Example1/BaseMesh.mat | 95 ++++++++ Samples~/Example1/BaseMesh.mat.meta | 8 + Samples~/Example1/BaseMesh_A.mat | 20 +- Samples~/Example1/Prefabs/BaseMesh.prefab | 28 +-- Samples~/Example1/Scenes/Sample_01.unity | 2 +- .../SampleAnimationSystemsAuthoring.cs | 10 +- .../Example1/Shaders/VAT_Unit.shadergraph | 154 ++++++------- .../Example1/Shaders/VAT_Unit_A.shadergraph | 151 ++++++------- .../Example1/Shaders/VAT_Unit_ANM.shadergraph | 155 ++++++-------- .../Textures/BaseMesh_Albedo.png.meta | 2 + .../VAT_N-Character1Run_F-22.exr.meta | 2 + ...F-22.exr => VAT_N-Character2Run1_F-22.exr} | Bin ...eta => VAT_N-Character2Run1_F-22.exr.meta} | 0 ...F-36.exr => VAT_N-Character2Run2_F-36.exr} | Bin ...eta => VAT_N-Character2Run2_F-36.exr.meta} | 0 16 files changed, 485 insertions(+), 344 deletions(-) create mode 100644 Samples~/Example1/BaseMesh.mat create mode 100644 Samples~/Example1/BaseMesh.mat.meta rename Samples~/Example1/Textures/Characters/Character2/{VAT_N-Character2Run_F-22.exr => VAT_N-Character2Run1_F-22.exr} (100%) rename Samples~/Example1/Textures/Characters/Character2/{VAT_N-Character2Run_F-22.exr.meta => VAT_N-Character2Run1_F-22.exr.meta} (100%) rename Samples~/Example1/Textures/Characters/Character2/{VAT_N-Character2Run_F-36.exr => VAT_N-Character2Run2_F-36.exr} (100%) rename Samples~/Example1/Textures/Characters/Character2/{VAT_N-Character2Run_F-36.exr.meta => VAT_N-Character2Run2_F-36.exr.meta} (100%) diff --git a/Samples~/Example1/Animations/BaseMeshBook.asset b/Samples~/Example1/Animations/BaseMeshBook.asset index 73e9a23..c07622b 100644 --- a/Samples~/Example1/Animations/BaseMeshBook.asset +++ b/Samples~/Example1/Animations/BaseMeshBook.asset @@ -12,77 +12,131 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 97cdf8b194bcb83459d952b3cb008113, type: 3} m_Name: BaseMeshBook m_EditorClassIdentifier: - maxFrames: 43 - textureGroups: - - shaderParamName: _PositionMap - textureType: 0 - wrapMode: 0 - filterMode: 0 - isLinear: 0 - - shaderParamName: _Albedo - textureType: 1 - wrapMode: 0 - filterMode: 1 - isLinear: 0 - animationPages: - - name: C1Run - frames: 22 - textures: - - texture2D: {fileID: 2800000, guid: e1cf093cfd680f7469c1a379a8ccd813, type: 3} - textureArrayIndex: 0 - - texture2D: {fileID: 2800000, guid: e96b2d6ae6f1bcd4bbcf185aa11cf684, type: 3} - textureArrayIndex: 0 - - name: C1Shoot - frames: 36 - textures: - - texture2D: {fileID: 2800000, guid: 4b4399657fc72b343b75adcf40f1c3a4, type: 3} - textureArrayIndex: 1 - - texture2D: {fileID: 2800000, guid: e96b2d6ae6f1bcd4bbcf185aa11cf684, type: 3} - textureArrayIndex: 0 - - name: C1Walk - frames: 22 - textures: - - texture2D: {fileID: 2800000, guid: 2dd510f65903ddf4e93918181d2e4990, type: 3} - textureArrayIndex: 2 - - texture2D: {fileID: 2800000, guid: e96b2d6ae6f1bcd4bbcf185aa11cf684, type: 3} - textureArrayIndex: 0 - - name: C2Run - frames: 22 - textures: - - texture2D: {fileID: 2800000, guid: c9ba2a68544b5af4ab057d61c5321051, type: 3} - textureArrayIndex: 3 - - texture2D: {fileID: 2800000, guid: 848c31021c4a9a3448eb4604fac5c63a, type: 3} - textureArrayIndex: 1 - - name: C2Run2 - frames: 36 - textures: - - texture2D: {fileID: 2800000, guid: 479116cbaa3717f49b2f56b50e68fb77, type: 3} - textureArrayIndex: 4 - - texture2D: {fileID: 2800000, guid: 848c31021c4a9a3448eb4604fac5c63a, type: 3} - textureArrayIndex: 1 - - name: C2Walk - frames: 22 - textures: - - texture2D: {fileID: 2800000, guid: 2a3cbb5e3a9defa44919c1a706f11b3d, type: 3} - textureArrayIndex: 5 - - texture2D: {fileID: 2800000, guid: 848c31021c4a9a3448eb4604fac5c63a, type: 3} - textureArrayIndex: 1 - - name: C3Run - frames: 22 - textures: - - texture2D: {fileID: 2800000, guid: 55362ebf36c379845b1914b46a30d543, type: 3} - textureArrayIndex: 6 - - texture2D: {fileID: 2800000, guid: a54c0b59a9ad0ac4390703fcc93ddda6, type: 3} - textureArrayIndex: 2 - - name: C3Walk - frames: 22 - textures: - - texture2D: {fileID: 2800000, guid: e223695e377801e4491c2d740a877783, type: 3} - textureArrayIndex: 7 - - texture2D: {fileID: 2800000, guid: a54c0b59a9ad0ac4390703fcc93ddda6, type: 3} - textureArrayIndex: 2 - materials: - - {fileID: 2100000, guid: 04f511d576d5e534a947d3f10915578a, type: 2} - texture2DArray: - - {fileID: 0} - - {fileID: 0} + playData: + textureGroups: + - shaderParamName: _PositionMap + textureType: 0 + - shaderParamName: _Albedo + textureType: 1 + animationPages: + - name: Character1Run + frames: 22 + textures: + - textureArrayIndex: 0 + - textureArrayIndex: 0 + - name: Character1Shoot + frames: 36 + textures: + - textureArrayIndex: 1 + - textureArrayIndex: 0 + - name: Character1Walk + frames: 22 + textures: + - textureArrayIndex: 2 + - textureArrayIndex: 0 + - name: Character2Run1 + frames: 22 + textures: + - textureArrayIndex: 3 + - textureArrayIndex: 1 + - name: Character2Run2 + frames: 36 + textures: + - textureArrayIndex: 4 + - textureArrayIndex: 1 + - name: Character2Walk + frames: 22 + textures: + - textureArrayIndex: 5 + - textureArrayIndex: 1 + - name: Character3Run + frames: 22 + textures: + - textureArrayIndex: 6 + - textureArrayIndex: 2 + - name: Character3Walk + frames: 22 + textures: + - textureArrayIndex: 7 + - textureArrayIndex: 2 + maxFrames: 43 + materials: + - {fileID: 2100000, guid: 04f511d576d5e534a947d3f10915578a, type: 2} + texture2DArray: + - {fileID: 18700000, guid: 9e19fc3c9e58d7a438cc5a0be433e230, type: 2} + - {fileID: 18700000, guid: a9cc274b41fe53c47ba2187ffdb70c5b, type: 2} + editorData: + textureGroups: + - shaderParamName: _PositionMap + textureType: 0 + wrapMode: 0 + filterMode: 0 + isLinear: 0 + - shaderParamName: _Albedo + textureType: 1 + wrapMode: 0 + filterMode: 1 + isLinear: 0 + animationPages: + - name: Character1Run + frames: 22 + textures: + - texture2D: {fileID: 2800000, guid: e1cf093cfd680f7469c1a379a8ccd813, type: 3} + textureArrayIndex: 0 + - texture2D: {fileID: 2800000, guid: e96b2d6ae6f1bcd4bbcf185aa11cf684, type: 3} + textureArrayIndex: 0 + - name: Character1Shoot + frames: 36 + textures: + - texture2D: {fileID: 2800000, guid: 4b4399657fc72b343b75adcf40f1c3a4, type: 3} + textureArrayIndex: 1 + - texture2D: {fileID: 2800000, guid: e96b2d6ae6f1bcd4bbcf185aa11cf684, type: 3} + textureArrayIndex: 0 + - name: Character1Walk + frames: 22 + textures: + - texture2D: {fileID: 2800000, guid: 2dd510f65903ddf4e93918181d2e4990, type: 3} + textureArrayIndex: 2 + - texture2D: {fileID: 2800000, guid: e96b2d6ae6f1bcd4bbcf185aa11cf684, type: 3} + textureArrayIndex: 0 + - name: Character2Run1 + frames: 22 + textures: + - texture2D: {fileID: 2800000, guid: c9ba2a68544b5af4ab057d61c5321051, type: 3} + textureArrayIndex: 3 + - texture2D: {fileID: 2800000, guid: 848c31021c4a9a3448eb4604fac5c63a, type: 3} + textureArrayIndex: 1 + - name: Character2Run2 + frames: 36 + textures: + - texture2D: {fileID: 2800000, guid: 479116cbaa3717f49b2f56b50e68fb77, type: 3} + textureArrayIndex: 4 + - texture2D: {fileID: 2800000, guid: 848c31021c4a9a3448eb4604fac5c63a, type: 3} + textureArrayIndex: 1 + - name: Character2Walk + frames: 22 + textures: + - texture2D: {fileID: 2800000, guid: 2a3cbb5e3a9defa44919c1a706f11b3d, type: 3} + textureArrayIndex: 5 + - texture2D: {fileID: 2800000, guid: 848c31021c4a9a3448eb4604fac5c63a, type: 3} + textureArrayIndex: 1 + - name: Character3Run + frames: 22 + textures: + - texture2D: {fileID: 2800000, guid: 55362ebf36c379845b1914b46a30d543, type: 3} + textureArrayIndex: 6 + - texture2D: {fileID: 2800000, guid: a54c0b59a9ad0ac4390703fcc93ddda6, type: 3} + textureArrayIndex: 2 + - name: Character3Walk + frames: 22 + textures: + - texture2D: {fileID: 2800000, guid: e223695e377801e4491c2d740a877783, type: 3} + textureArrayIndex: 7 + - texture2D: {fileID: 2800000, guid: a54c0b59a9ad0ac4390703fcc93ddda6, type: 3} + textureArrayIndex: 2 + maxFrames: 43 + materials: + - {fileID: 2100000, guid: 04f511d576d5e534a947d3f10915578a, type: 2} + texture2DArray: + - {fileID: 18700000, guid: 9e19fc3c9e58d7a438cc5a0be433e230, type: 2} + - {fileID: 18700000, guid: a9cc274b41fe53c47ba2187ffdb70c5b, type: 2} diff --git a/Samples~/Example1/BaseMesh.mat b/Samples~/Example1/BaseMesh.mat new file mode 100644 index 0000000..400c112 --- /dev/null +++ b/Samples~/Example1/BaseMesh.mat @@ -0,0 +1,95 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BaseMesh + m_Shader: {fileID: -6465566751694194690, guid: 94cb02f8532e9d94a9e1304ddb58aa1b, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - Texture2DArray_928923a75c784b10bc05d8bc3566462c: + m_Texture: {fileID: -214877651785004706, guid: b3b646e2929f71c4aba21cec9c75e0db, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - Texture2D_0f48565a5e3d42ecb288ff6ffffea378: + m_Texture: {fileID: 2800000, guid: e96b2d6ae6f1bcd4bbcf185aa11cf684, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - Texture2D_0fb16c1922444c398e7544fa6640281f: + m_Texture: {fileID: 2800000, guid: 8094332d16758ca419b1b89841f845d7, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - Texture2D_399f325c1b514839909c867eb3f35038: + m_Texture: {fileID: 2800000, guid: b7efd71977b8ba045ae5a35ae0687d9e, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - Texture2D_4146f7cd0acc4118a1e047434abff8be: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - Texture2D_ed6b5c2823e54bd2891b51d824967a2e: + m_Texture: {fileID: 2800000, guid: 6df7c98f028b15040b46e46062a434ef, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Albedo: + m_Texture: {fileID: 2800000, guid: e96b2d6ae6f1bcd4bbcf185aa11cf684, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: e96b2d6ae6f1bcd4bbcf185aa11cf684, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Mask: + m_Texture: {fileID: 2800000, guid: b7efd71977b8ba045ae5a35ae0687d9e, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Normal: + m_Texture: {fileID: 2800000, guid: 6df7c98f028b15040b46e46062a434ef, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _PositionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _VATMJ_b437dd17f774428893cfb53e90ff89ef_Texture2D04457d0e252746e0b6a2d77384c60270_1292871148: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - Boolean_b6ca69388c554943b7067cf776a1104a: 1 + - Vector1_90ee8ae99c2240c6a1a148cd7b9a7a34: 10.34 + - Vector1_e136900ab10043818322b1c153cb442b: 0.5 + - Vector1_f0d9e4dad8e7447fb562ded3227f3750: 43 + - _AnimationIndex: 1 + - _AnimationTime: 0 + - _MaxFrames: 43 + - _Speed: 1 + - _TextureIndex: 0 + m_Colors: + - _AnimationData: {r: 0, g: 0, b: 0, a: 0} + - _AnimationData1: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/Samples~/Example1/BaseMesh.mat.meta b/Samples~/Example1/BaseMesh.mat.meta new file mode 100644 index 0000000..3396253 --- /dev/null +++ b/Samples~/Example1/BaseMesh.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 12f3ea37d90c84c4aa5e6bf62a0a5707 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Samples~/Example1/BaseMesh_A.mat b/Samples~/Example1/BaseMesh_A.mat index 9c5883b..44e4fdc 100644 --- a/Samples~/Example1/BaseMesh_A.mat +++ b/Samples~/Example1/BaseMesh_A.mat @@ -44,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _Albedo: - m_Texture: {fileID: 0} + m_Texture: {fileID: 18700000, guid: a9cc274b41fe53c47ba2187ffdb70c5b, type: 2} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: @@ -52,21 +52,33 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _Mask: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: b7efd71977b8ba045ae5a35ae0687d9e, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _Normal: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 6df7c98f028b15040b46e46062a434ef, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _PositionMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 18700000, guid: 9e19fc3c9e58d7a438cc5a0be433e230, type: 2} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _VATMJ_b437dd17f774428893cfb53e90ff89ef_Texture2D04457d0e252746e0b6a2d77384c60270_1292871148: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - Boolean_b6ca69388c554943b7067cf776a1104a: 1 - Vector1_90ee8ae99c2240c6a1a148cd7b9a7a34: 10.34 diff --git a/Samples~/Example1/Prefabs/BaseMesh.prefab b/Samples~/Example1/Prefabs/BaseMesh.prefab index f19ac35..52100a6 100644 --- a/Samples~/Example1/Prefabs/BaseMesh.prefab +++ b/Samples~/Example1/Prefabs/BaseMesh.prefab @@ -10,10 +10,10 @@ GameObject: m_Component: - component: {fileID: 454067150296777415} - component: {fileID: 4902348880141478088} - - component: {fileID: 1683868614667261777} - component: {fileID: 7322754236601803274} + - component: {fileID: 1683868614667261777} m_Layer: 0 - m_Name: BaseMesh_LOD_Single + m_Name: BaseMesh m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -68,6 +68,18 @@ LODGroup: renderers: - renderer: {fileID: 8600995544659564579} m_Enabled: 1 +--- !u!114 &7322754236601803274 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 938713576735856765} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 29deecb09ead9e74aa32f9d265f1e7ef, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &1683868614667261777 MonoBehaviour: m_ObjectHideFlags: 0 @@ -81,18 +93,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: ConversionMode: 0 ---- !u!114 &7322754236601803274 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 938713576735856765} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 29deecb09ead9e74aa32f9d265f1e7ef, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &4305454405175524092 GameObject: m_ObjectHideFlags: 0 diff --git a/Samples~/Example1/Scenes/Sample_01.unity b/Samples~/Example1/Scenes/Sample_01.unity index fff0c1a..20ee664 100644 --- a/Samples~/Example1/Scenes/Sample_01.unity +++ b/Samples~/Example1/Scenes/Sample_01.unity @@ -160,7 +160,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: be88cdedc79d5b04e8d6658b4a9893b0, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Samples~/Example1/Scripts/SampleAnimationSystemsAuthoring.cs b/Samples~/Example1/Scripts/SampleAnimationSystemsAuthoring.cs index 386494b..d257b34 100644 --- a/Samples~/Example1/Scripts/SampleAnimationSystemsAuthoring.cs +++ b/Samples~/Example1/Scripts/SampleAnimationSystemsAuthoring.cs @@ -1,5 +1,6 @@ using Unity.Entities; using Unity.Mathematics; +using Unity.Collections; using TAO.VertexAnimation; public class SampleAnimationSystemsAuthoring : UnityEngine.MonoBehaviour @@ -7,6 +8,9 @@ public class SampleAnimationSystemsAuthoring : UnityEngine.MonoBehaviour [UnityEngine.SerializeField] private SampleSystem sampleSystem = SampleSystem.PlayRandomAnimation; + [UnityEngine.SerializeField] + private string animationName = "Character1Shoot"; + private void Awake() { switch (sampleSystem) @@ -20,6 +24,7 @@ public class SampleAnimationSystemsAuthoring : UnityEngine.MonoBehaviour case SampleSystem.PlayAnimationByName: { var system = World.DefaultGameObjectInjectionWorld.GetExistingSystem(); + system.animationName = animationName; system.Enabled = true; } break; @@ -77,6 +82,8 @@ public class PlayRandomAnimationSystem : SystemBase [UpdateBefore(typeof(VA_AnimatorSystem))] public class PlayAnimationByNameSystem : SystemBase { + public FixedString32 animationName; + protected override void OnCreate() { base.OnCreate(); @@ -87,6 +94,7 @@ public class PlayAnimationByNameSystem : SystemBase protected override void OnUpdate() { float deltaTime = UnityEngine.Time.deltaTime; + FixedString32 an = animationName; Entities.ForEach((Entity entity, ref VA_AnimatorComponent ac) => { @@ -94,7 +102,7 @@ public class PlayAnimationByNameSystem : SystemBase ref VA_AnimationLibraryData animationsRef = ref ac.animationLibrary.Value; // Set the animation index on the AnimatorComponent to play this animation. - ac.animationIndex = VA_AnimationLibraryUtils.GetAnimation(ref animationsRef, "Character1Shoot"); + ac.animationIndex = VA_AnimationLibraryUtils.GetAnimation(ref animationsRef, an); // 'Play' the actual animation. ac.animationTime += deltaTime; diff --git a/Samples~/Example1/Shaders/VAT_Unit.shadergraph b/Samples~/Example1/Shaders/VAT_Unit.shadergraph index b847fc1..8dae6be 100644 --- a/Samples~/Example1/Shaders/VAT_Unit.shadergraph +++ b/Samples~/Example1/Shaders/VAT_Unit.shadergraph @@ -489,6 +489,7 @@ "m_Id": "a5e38a9969934c4f8bdb3aafc6f9a8f9" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -520,6 +521,7 @@ "m_Id": "845f0eea857341929cd95b028a5fe99e" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -535,7 +537,6 @@ "m_Id": 5, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 2, @@ -553,7 +554,6 @@ "m_Id": 1, "m_DisplayName": "Vector3", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector3", "m_StageCapability": 3, @@ -597,6 +597,7 @@ "m_Id": "20fe9673ed5b49a0b49605e7e59b0ba9" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -649,6 +650,7 @@ "m_Id": "62b1a371e9924fd889d8b3a682c16a97" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, "m_CustomColors": { @@ -665,7 +667,6 @@ "m_Id": 509595180, "m_DisplayName": "Time", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector1_f9b649ed28584dca8a522f3fb582f350", "m_StageCapability": 3, @@ -683,7 +684,6 @@ "m_Id": 2, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -731,6 +731,7 @@ "m_Id": "e65512528ea145dd9bf6099aa11befda" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, "m_CustomColors": { @@ -745,7 +746,6 @@ "m_Id": 0, "m_DisplayName": "Position", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Position", "m_StageCapability": 1, @@ -774,7 +774,6 @@ "m_Id": 1, "m_DisplayName": "Position", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Position", "m_StageCapability": 3, @@ -802,7 +801,6 @@ "m_Id": 0, "m_DisplayName": "Metallic", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Metallic", "m_StageCapability": 2, @@ -820,7 +818,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -845,7 +842,6 @@ "m_Id": 1, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -886,6 +882,7 @@ "m_Id": "4e4377d1d1924361a4d206ebb0081684" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -903,7 +900,6 @@ "m_Id": -292266562, "m_DisplayName": "PositionMap", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Texture2DArray_c333595616b942739573e272a2bcc553", "m_StageCapability": 3, @@ -920,7 +916,6 @@ "m_Id": 1, "m_DisplayName": "Texture", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Texture", "m_StageCapability": 3, @@ -954,6 +949,7 @@ "m_Id": "5f0f70dbc97a46d0819e70996614c3e0" } ], + "synonyms": [], "m_Precision": 1, "m_PreviewExpanded": false, "m_CustomColors": { @@ -969,7 +965,6 @@ "m_Id": 0, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3 @@ -987,7 +982,8 @@ "m_OverrideReferenceName": "_Mask", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", @@ -1020,6 +1016,7 @@ "m_Id": "a49d233e5b2f4942a15d5eb89520104b" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -1037,7 +1034,6 @@ "m_Id": 0, "m_DisplayName": "PositionMap", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3 @@ -1087,6 +1083,7 @@ "m_Id": "71057566e2614a69a0425ea232984fc9" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, "m_CustomColors": { @@ -1103,7 +1100,6 @@ "m_Id": 4, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 2, @@ -1121,7 +1117,6 @@ "m_Id": 1, "m_DisplayName": "Texture", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Texture", "m_StageCapability": 3, @@ -1129,11 +1124,11 @@ "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" }, - "m_DefaultType": 3 + "m_DefaultType": 0 } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector4ShaderProperty", "m_ObjectId": "4482681b88db46bfb9ec64b3e79de5e6", "m_Guid": { @@ -1144,7 +1139,8 @@ "m_OverrideReferenceName": "_AnimationData", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": true, + "overrideHLSLDeclaration": true, + "hlslDeclarationOverride": 3, "m_Hidden": false, "m_Value": { "x": 0.0, @@ -1166,7 +1162,8 @@ "m_OverrideReferenceName": "_Albedo", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", @@ -1183,7 +1180,6 @@ "m_Id": 2, "m_DisplayName": "Alpha", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Alpha", "m_StageCapability": 3, @@ -1211,7 +1207,6 @@ "m_Id": -1634479697, "m_DisplayName": "PositionMapIndex", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector1_cc4eba55004546408c4665cdb22d3111", "m_StageCapability": 3, @@ -1229,7 +1224,6 @@ "m_Id": 4, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 2, @@ -1247,7 +1241,6 @@ "m_Id": 1220204877, "m_DisplayName": "SamplerState", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "SamplerState_Linear_Repeat", "m_StageCapability": 3 @@ -1271,7 +1264,6 @@ "m_Id": 0, "m_DisplayName": "MaxFrames", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1289,7 +1281,6 @@ "m_Id": 4, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -1307,7 +1298,6 @@ "m_Id": 0, "m_DisplayName": "RGBA", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "RGBA", "m_StageCapability": 2, @@ -1322,7 +1312,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_Labels": [] } { @@ -1332,7 +1323,6 @@ "m_Id": 1, "m_DisplayName": "Texture", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Texture", "m_StageCapability": 3, @@ -1350,7 +1340,6 @@ "m_Id": 2, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 3, @@ -1368,7 +1357,6 @@ "m_Id": 3, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -1386,7 +1374,6 @@ "m_Id": 0, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1414,7 +1401,6 @@ "m_Id": 5, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 2, @@ -1432,7 +1418,6 @@ "m_Id": 3, "m_DisplayName": "Sampler", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Sampler", "m_StageCapability": 3 @@ -1445,7 +1430,6 @@ "m_Id": 7, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 2, @@ -1463,7 +1447,6 @@ "m_Id": 5, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 2, @@ -1481,7 +1464,6 @@ "m_Id": 0, "m_DisplayName": "AnimationData", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1496,7 +1478,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_Labels": [] } { @@ -1506,7 +1489,6 @@ "m_Id": 7, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 2, @@ -1540,6 +1522,7 @@ "m_Id": "792aa6804e9645f7ab372c7d78c402e4" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -1557,7 +1540,6 @@ "m_Id": 2, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -1583,7 +1565,6 @@ "m_Id": 3, "m_DisplayName": "Sampler", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Sampler", "m_StageCapability": 3 @@ -1612,6 +1593,7 @@ "m_Id": "38a33ff7982645419c715f3d99b31e16" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -1628,7 +1610,6 @@ "m_Id": 0, "m_DisplayName": "RGBA", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "RGBA", "m_StageCapability": 2, @@ -1643,7 +1624,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_Labels": [] } { @@ -1653,7 +1635,6 @@ "m_Id": 0, "m_DisplayName": "Normal", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3 @@ -1666,7 +1647,6 @@ "m_Id": 6, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 2, @@ -1684,7 +1664,6 @@ "m_Id": 0, "m_DisplayName": "Smoothness", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Smoothness", "m_StageCapability": 2, @@ -1702,7 +1681,6 @@ "m_Id": 0, "m_DisplayName": "Albedo", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3 @@ -1715,7 +1693,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -1756,6 +1733,7 @@ "m_Id": "b303bce1f89843b78ddd84bf8d0eef15" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -1771,7 +1749,6 @@ "m_Id": 0, "m_DisplayName": "Normal (Tangent Space)", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "NormalTS", "m_StageCapability": 2, @@ -1805,7 +1782,8 @@ "m_OverrideReferenceName": "_PositionMap", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"textureArray\":{\"instanceID\":0}}", @@ -1821,7 +1799,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -1883,12 +1860,13 @@ "m_Id": "fb453fbeae9047dd8e89ee265797233f" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, "m_CustomColors": { "m_SerializableColors": [] }, - "m_TextureType": 1, + "m_TextureType": 0, "m_NormalMapSpace": 0 } @@ -1899,7 +1877,6 @@ "m_Id": 0, "m_DisplayName": "Mask", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3 @@ -1912,7 +1889,6 @@ "m_Id": 0, "m_DisplayName": "Ambient Occlusion", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Occlusion", "m_StageCapability": 2, @@ -1930,7 +1906,6 @@ "m_Id": 4, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 2, @@ -1948,7 +1923,6 @@ "m_Id": 2, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -1974,7 +1948,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -1999,7 +1972,6 @@ "m_Id": 0, "m_DisplayName": "Emission", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Emission", "m_StageCapability": 2, @@ -2018,7 +1990,13 @@ "Y", "Z" ], - "m_ColorMode": 1 + "m_ColorMode": 1, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } } { @@ -2044,6 +2022,7 @@ "m_Id": "cd99e2a7f55149f1be0eae70fcb7d81e" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -2059,7 +2038,6 @@ "m_Id": 0, "m_DisplayName": "Tangent", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Tangent", "m_StageCapability": 1, @@ -2088,7 +2066,6 @@ "m_Id": 2078266122, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector2_a09a6ce7e08545d99b5bda70586f4e79", "m_StageCapability": 3, @@ -2129,6 +2106,7 @@ "m_Id": "f645af538404406083f6aeb7d6dff3f9" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, "m_CustomColors": { @@ -2144,7 +2122,6 @@ "m_Id": 0, "m_DisplayName": "Normal", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Normal", "m_StageCapability": 1, @@ -2203,6 +2180,7 @@ "m_Id": "c0f217568ccb4c1f943da958747a4950" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -2218,7 +2196,6 @@ "m_Id": 6, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 2, @@ -2252,6 +2229,7 @@ "m_Id": "95ad1504a6d240f2805b255a14b0672e" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -2286,6 +2264,7 @@ "m_Id": "29248f4553ef403f9c878254dc9e2afb" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, "m_CustomColors": { @@ -2316,6 +2295,7 @@ "m_Id": "6aa53aa11e6543d7a037f0e87bad5b7f" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -2333,7 +2313,6 @@ "m_Id": 0, "m_DisplayName": "Base Color", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "BaseColor", "m_StageCapability": 2, @@ -2352,7 +2331,13 @@ "Y", "Z" ], - "m_ColorMode": 0 + "m_ColorMode": 0, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } } { @@ -2362,7 +2347,6 @@ "m_Id": 654627568, "m_DisplayName": "Vector1", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector1_771ac3b08a1144b086078a0d07c220da", "m_StageCapability": 3, @@ -2396,6 +2380,7 @@ "m_Id": "897b65c8f10c47a8bbe5cd34d4df20b3" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -2413,7 +2398,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2436,7 +2420,8 @@ "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalLitSubTarget", "m_ObjectId": "e67a5b36bd4c401e906f606f1439a9b8", "m_WorkflowMode": 1, - "m_NormalDropOffSpace": 0 + "m_NormalDropOffSpace": 0, + "m_ClearCoat": false } { @@ -2462,6 +2447,7 @@ "m_Id": "dde262ac810448bab0e962f89add8832" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -2505,6 +2491,7 @@ "m_Id": "50d0093740504f3d8e10a0f6a985bd86" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -2556,6 +2543,7 @@ "m_Id": "451cb27f40264350b06faef47c3d8094" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -2587,7 +2575,6 @@ "m_Id": 0, "m_DisplayName": "RGBA", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "RGBA", "m_StageCapability": 2, @@ -2602,7 +2589,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_Labels": [] } { @@ -2617,7 +2605,8 @@ "m_OverrideReferenceName": "_Normal", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", @@ -2634,7 +2623,6 @@ "m_Id": -1112573420, "m_DisplayName": "MaxFrames", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector1_967e0c2bcb6e48c2b85b82c6d4c734a4", "m_StageCapability": 3, @@ -2652,7 +2640,6 @@ "m_Id": 7, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 2, @@ -2664,7 +2651,7 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "f0d9e4dad8e7447fb562ded3227f3750", "m_Guid": { @@ -2675,10 +2662,11 @@ "m_OverrideReferenceName": "_MaxFrames", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": true, + "hlslDeclarationOverride": 2, "m_Hidden": false, "m_Value": 0.0, - "m_FloatType": 0, + "m_FloatType": 2, "m_RangeValues": { "x": 0.0, "y": 1.0 @@ -2708,6 +2696,7 @@ "m_Id": "248d436857724c6ea25312da37a66b95" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -2723,7 +2712,6 @@ "m_Id": 6, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 2, @@ -2741,7 +2729,6 @@ "m_Id": 0, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2756,7 +2743,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_Labels": [] } { @@ -2771,8 +2759,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -345.0000305175781, - "y": 126.0, + "x": -346.0, + "y": 122.00000762939453, "width": 208.0, "height": 278.0 } @@ -2785,6 +2773,7 @@ "m_Id": "110e2aad15e941ea8e63129bb4d15485" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -2806,7 +2795,6 @@ "m_Id": 1, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 3, @@ -2824,7 +2812,6 @@ "m_Id": 3, "m_DisplayName": "Sampler", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Sampler", "m_StageCapability": 3 @@ -2853,6 +2840,7 @@ "m_Id": "40002b6db8c143569d63958b5e980bec" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { diff --git a/Samples~/Example1/Shaders/VAT_Unit_A.shadergraph b/Samples~/Example1/Shaders/VAT_Unit_A.shadergraph index 0dbea6a..f70eb0e 100644 --- a/Samples~/Example1/Shaders/VAT_Unit_A.shadergraph +++ b/Samples~/Example1/Shaders/VAT_Unit_A.shadergraph @@ -503,6 +503,7 @@ "m_Id": "a5e38a9969934c4f8bdb3aafc6f9a8f9" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -558,6 +559,7 @@ "m_Id": "1c0cfc8b786e41f1b05ea68987683797" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, "m_CustomColors": { @@ -588,6 +590,7 @@ "m_Id": "845f0eea857341929cd95b028a5fe99e" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -603,7 +606,6 @@ "m_Id": 5, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 2, @@ -621,7 +623,6 @@ "m_Id": 5, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 2, @@ -639,7 +640,6 @@ "m_Id": 1, "m_DisplayName": "Vector3", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector3", "m_StageCapability": 3, @@ -683,6 +683,7 @@ "m_Id": "20fe9673ed5b49a0b49605e7e59b0ba9" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -735,6 +736,7 @@ "m_Id": "62b1a371e9924fd889d8b3a682c16a97" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, "m_CustomColors": { @@ -751,7 +753,6 @@ "m_Id": 3, "m_DisplayName": "Sampler", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Sampler", "m_StageCapability": 3 @@ -764,7 +765,6 @@ "m_Id": 509595180, "m_DisplayName": "Time", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector1_f9b649ed28584dca8a522f3fb582f350", "m_StageCapability": 3, @@ -804,6 +804,7 @@ "m_Id": "e65512528ea145dd9bf6099aa11befda" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, "m_CustomColors": { @@ -818,7 +819,6 @@ "m_Id": 0, "m_DisplayName": "Position", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Position", "m_StageCapability": 1, @@ -847,7 +847,6 @@ "m_Id": 1, "m_DisplayName": "Position", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Position", "m_StageCapability": 3, @@ -875,7 +874,6 @@ "m_Id": 0, "m_DisplayName": "Metallic", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Metallic", "m_StageCapability": 2, @@ -893,7 +891,6 @@ "m_Id": 4, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 2, @@ -911,7 +908,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -936,7 +932,6 @@ "m_Id": 1, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -977,6 +972,7 @@ "m_Id": "4e4377d1d1924361a4d206ebb0081684" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -994,7 +990,6 @@ "m_Id": -292266562, "m_DisplayName": "PositionMap", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Texture2DArray_c333595616b942739573e272a2bcc553", "m_StageCapability": 3, @@ -1011,7 +1006,6 @@ "m_Id": 1, "m_DisplayName": "Texture", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Texture", "m_StageCapability": 3, @@ -1045,6 +1039,7 @@ "m_Id": "5f0f70dbc97a46d0819e70996614c3e0" } ], + "synonyms": [], "m_Precision": 1, "m_PreviewExpanded": false, "m_CustomColors": { @@ -1060,7 +1055,6 @@ "m_Id": 0, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3 @@ -1078,7 +1072,8 @@ "m_OverrideReferenceName": "_Mask", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", @@ -1100,7 +1095,8 @@ "m_OverrideReferenceName": "_Albedo", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"textureArray\":{\"instanceID\":0}}", @@ -1132,6 +1128,7 @@ "m_Id": "a49d233e5b2f4942a15d5eb89520104b" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -1149,7 +1146,6 @@ "m_Id": 0, "m_DisplayName": "PositionMap", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3 @@ -1199,6 +1195,7 @@ "m_Id": "71057566e2614a69a0425ea232984fc9" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, "m_CustomColors": { @@ -1215,7 +1212,6 @@ "m_Id": 4, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 2, @@ -1227,7 +1223,7 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector4ShaderProperty", "m_ObjectId": "4482681b88db46bfb9ec64b3e79de5e6", "m_Guid": { @@ -1238,7 +1234,8 @@ "m_OverrideReferenceName": "_AnimationData", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": true, + "overrideHLSLDeclaration": true, + "hlslDeclarationOverride": 3, "m_Hidden": false, "m_Value": { "x": 0.0, @@ -1255,7 +1252,6 @@ "m_Id": 2, "m_DisplayName": "Alpha", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Alpha", "m_StageCapability": 3, @@ -1283,7 +1279,6 @@ "m_Id": -1634479697, "m_DisplayName": "PositionMapIndex", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector1_cc4eba55004546408c4665cdb22d3111", "m_StageCapability": 3, @@ -1301,7 +1296,6 @@ "m_Id": 4, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 2, @@ -1319,7 +1313,6 @@ "m_Id": 0, "m_DisplayName": "Albedo", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3 @@ -1332,7 +1325,6 @@ "m_Id": 1220204877, "m_DisplayName": "SamplerState", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "SamplerState_Linear_Repeat", "m_StageCapability": 3 @@ -1356,7 +1348,6 @@ "m_Id": 0, "m_DisplayName": "MaxFrames", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1374,7 +1365,6 @@ "m_Id": 4, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -1392,7 +1382,6 @@ "m_Id": 0, "m_DisplayName": "RGBA", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "RGBA", "m_StageCapability": 2, @@ -1407,7 +1396,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_Labels": [] } { @@ -1417,7 +1407,6 @@ "m_Id": 1, "m_DisplayName": "Texture", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Texture", "m_StageCapability": 3, @@ -1435,7 +1424,6 @@ "m_Id": 2, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 3, @@ -1453,7 +1441,6 @@ "m_Id": 6, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 2, @@ -1471,7 +1458,6 @@ "m_Id": 3, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -1489,7 +1475,6 @@ "m_Id": 0, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1517,7 +1502,6 @@ "m_Id": 3, "m_DisplayName": "Sampler", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Sampler", "m_StageCapability": 3 @@ -1530,7 +1514,6 @@ "m_Id": 5, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 2, @@ -1548,7 +1531,6 @@ "m_Id": 0, "m_DisplayName": "RGBA", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "RGBA", "m_StageCapability": 2, @@ -1563,7 +1545,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_Labels": [] } { @@ -1573,7 +1556,6 @@ "m_Id": 0, "m_DisplayName": "AnimationData", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1588,7 +1570,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_Labels": [] } { @@ -1598,7 +1581,6 @@ "m_Id": 7, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 2, @@ -1632,6 +1614,7 @@ "m_Id": "792aa6804e9645f7ab372c7d78c402e4" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -1649,7 +1632,6 @@ "m_Id": 2, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -1675,7 +1657,6 @@ "m_Id": 3, "m_DisplayName": "Sampler", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Sampler", "m_StageCapability": 3 @@ -1704,6 +1685,7 @@ "m_Id": "38a33ff7982645419c715f3d99b31e16" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -1720,7 +1702,6 @@ "m_Id": 0, "m_DisplayName": "RGBA", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "RGBA", "m_StageCapability": 2, @@ -1735,7 +1716,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_Labels": [] } { @@ -1745,7 +1727,6 @@ "m_Id": 0, "m_DisplayName": "Normal", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3 @@ -1758,7 +1739,6 @@ "m_Id": 6, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 2, @@ -1776,7 +1756,6 @@ "m_Id": 7, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 2, @@ -1794,7 +1773,6 @@ "m_Id": 0, "m_DisplayName": "Smoothness", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Smoothness", "m_StageCapability": 2, @@ -1812,7 +1790,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -1853,6 +1830,7 @@ "m_Id": "b303bce1f89843b78ddd84bf8d0eef15" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -1868,7 +1846,6 @@ "m_Id": 0, "m_DisplayName": "Normal (Tangent Space)", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "NormalTS", "m_StageCapability": 2, @@ -1902,7 +1879,8 @@ "m_OverrideReferenceName": "_PositionMap", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"textureArray\":{\"instanceID\":0}}", @@ -1918,7 +1896,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -1943,7 +1920,6 @@ "m_Id": 0, "m_DisplayName": "Mask", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3 @@ -1956,7 +1932,6 @@ "m_Id": 0, "m_DisplayName": "Ambient Occlusion", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Occlusion", "m_StageCapability": 2, @@ -1974,7 +1949,6 @@ "m_Id": 2, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -2000,7 +1974,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -2025,7 +1998,6 @@ "m_Id": 0, "m_DisplayName": "Emission", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Emission", "m_StageCapability": 2, @@ -2044,7 +2016,13 @@ "Y", "Z" ], - "m_ColorMode": 1 + "m_ColorMode": 1, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } } { @@ -2070,6 +2048,7 @@ "m_Id": "cd99e2a7f55149f1be0eae70fcb7d81e" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -2085,7 +2064,6 @@ "m_Id": 0, "m_DisplayName": "Tangent", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Tangent", "m_StageCapability": 1, @@ -2114,7 +2092,6 @@ "m_Id": 2078266122, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector2_a09a6ce7e08545d99b5bda70586f4e79", "m_StageCapability": 3, @@ -2155,6 +2132,7 @@ "m_Id": "4c0a6c6d52bc4fb1828bcf5c92d71952" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -2188,6 +2166,7 @@ "m_Id": "f645af538404406083f6aeb7d6dff3f9" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, "m_CustomColors": { @@ -2203,7 +2182,6 @@ "m_Id": 0, "m_DisplayName": "Normal", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Normal", "m_StageCapability": 1, @@ -2246,7 +2224,6 @@ "m_Id": 8, "m_DisplayName": "Index", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Index", "m_StageCapability": 3, @@ -2280,6 +2257,7 @@ "m_Id": "c0f217568ccb4c1f943da958747a4950" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -2311,6 +2289,7 @@ "m_Id": "95ad1504a6d240f2805b255a14b0672e" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -2345,6 +2324,7 @@ "m_Id": "29248f4553ef403f9c878254dc9e2afb" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, "m_CustomColors": { @@ -2375,6 +2355,7 @@ "m_Id": "6aa53aa11e6543d7a037f0e87bad5b7f" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -2392,7 +2373,6 @@ "m_Id": 0, "m_DisplayName": "Base Color", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "BaseColor", "m_StageCapability": 2, @@ -2411,7 +2391,13 @@ "Y", "Z" ], - "m_ColorMode": 0 + "m_ColorMode": 0, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } } { @@ -2421,7 +2407,6 @@ "m_Id": 654627568, "m_DisplayName": "Vector1", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector1_771ac3b08a1144b086078a0d07c220da", "m_StageCapability": 3, @@ -2439,7 +2424,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2462,7 +2446,8 @@ "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalLitSubTarget", "m_ObjectId": "e67a5b36bd4c401e906f606f1439a9b8", "m_WorkflowMode": 1, - "m_NormalDropOffSpace": 0 + "m_NormalDropOffSpace": 0, + "m_ClearCoat": false } { @@ -2488,6 +2473,7 @@ "m_Id": "dde262ac810448bab0e962f89add8832" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -2531,6 +2517,7 @@ "m_Id": "50d0093740504f3d8e10a0f6a985bd86" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -2582,6 +2569,7 @@ "m_Id": "451cb27f40264350b06faef47c3d8094" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -2618,7 +2606,8 @@ "m_OverrideReferenceName": "_Normal", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", @@ -2635,7 +2624,6 @@ "m_Id": -1112573420, "m_DisplayName": "MaxFrames", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector1_967e0c2bcb6e48c2b85b82c6d4c734a4", "m_StageCapability": 3, @@ -2653,7 +2641,6 @@ "m_Id": 7, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 2, @@ -2665,7 +2652,7 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "f0d9e4dad8e7447fb562ded3227f3750", "m_Guid": { @@ -2676,10 +2663,11 @@ "m_OverrideReferenceName": "_MaxFrames", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": true, + "hlslDeclarationOverride": 2, "m_Hidden": false, "m_Value": 0.0, - "m_FloatType": 0, + "m_FloatType": 2, "m_RangeValues": { "x": 0.0, "y": 1.0 @@ -2709,6 +2697,7 @@ "m_Id": "248d436857724c6ea25312da37a66b95" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -2724,7 +2713,6 @@ "m_Id": 2, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -2750,7 +2738,6 @@ "m_Id": 1, "m_DisplayName": "Texture Array", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Texture Array", "m_StageCapability": 3, @@ -2767,7 +2754,6 @@ "m_Id": 6, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 2, @@ -2785,7 +2771,6 @@ "m_Id": 0, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2800,7 +2785,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_Labels": [] } { @@ -2815,8 +2801,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -345.0000305175781, - "y": 126.0, + "x": -346.0, + "y": 119.00000762939453, "width": 208.0, "height": 278.0 } @@ -2829,6 +2815,7 @@ "m_Id": "110e2aad15e941ea8e63129bb4d15485" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -2850,7 +2837,6 @@ "m_Id": 1, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 3, @@ -2884,6 +2870,7 @@ "m_Id": "40002b6db8c143569d63958b5e980bec" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { diff --git a/Samples~/Example1/Shaders/VAT_Unit_ANM.shadergraph b/Samples~/Example1/Shaders/VAT_Unit_ANM.shadergraph index 4fa8fe9..ddbcc52 100644 --- a/Samples~/Example1/Shaders/VAT_Unit_ANM.shadergraph +++ b/Samples~/Example1/Shaders/VAT_Unit_ANM.shadergraph @@ -548,6 +548,7 @@ "m_Id": "a5e38a9969934c4f8bdb3aafc6f9a8f9" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -563,7 +564,6 @@ "m_Id": 0, "m_DisplayName": "AnimationData", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -578,7 +578,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_Labels": [] } { @@ -588,7 +589,6 @@ "m_Id": 3, "m_DisplayName": "Sampler", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Sampler", "m_StageCapability": 3 @@ -601,7 +601,6 @@ "m_Id": 6, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 2, @@ -635,6 +634,7 @@ "m_Id": "845f0eea857341929cd95b028a5fe99e" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -650,7 +650,6 @@ "m_Id": 1, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 3, @@ -668,7 +667,6 @@ "m_Id": 6, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 2, @@ -702,6 +700,7 @@ "m_Id": "b1e94983b20a4377bd28bd8113dbe2f1" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -724,7 +723,8 @@ "m_OverrideReferenceName": "_Normal", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"textureArray\":{\"instanceID\":0}}", @@ -745,7 +745,8 @@ "m_OverrideReferenceName": "_Albedo", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"textureArray\":{\"instanceID\":0}}", @@ -777,6 +778,7 @@ "m_Id": "20fe9673ed5b49a0b49605e7e59b0ba9" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -811,6 +813,7 @@ "m_Id": "7b644363277b4209bdbd42fbaa6ac628" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -872,6 +875,7 @@ "m_Id": "8263d0bb88564280961125f3341495a4" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -926,6 +930,7 @@ "m_Id": "093ade93f03e4de18a234f8a45d74731" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -962,6 +967,7 @@ "m_Id": "e65512528ea145dd9bf6099aa11befda" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, "m_CustomColors": { @@ -976,7 +982,6 @@ "m_Id": 0, "m_DisplayName": "Albedo", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3 @@ -989,7 +994,6 @@ "m_Id": 0, "m_DisplayName": "Position", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Position", "m_StageCapability": 1, @@ -1018,7 +1022,6 @@ "m_Id": 4, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -1036,7 +1039,6 @@ "m_Id": 1, "m_DisplayName": "Texture Array", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Texture Array", "m_StageCapability": 3, @@ -1053,7 +1055,6 @@ "m_Id": 0, "m_DisplayName": "Metallic", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Metallic", "m_StageCapability": 2, @@ -1071,7 +1072,6 @@ "m_Id": 3, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -1089,7 +1089,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -1114,7 +1113,6 @@ "m_Id": 7, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 2, @@ -1148,6 +1146,7 @@ "m_Id": "4e4377d1d1924361a4d206ebb0081684" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -1193,6 +1192,7 @@ "m_Id": "2103db718bcd406b846e1c90594f70cf" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -1212,7 +1212,8 @@ "m_OverrideReferenceName": "_Mask", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"textureArray\":{\"instanceID\":0}}", @@ -1244,6 +1245,7 @@ "m_Id": "5f0f70dbc97a46d0819e70996614c3e0" } ], + "synonyms": [], "m_Precision": 1, "m_PreviewExpanded": false, "m_CustomColors": { @@ -1259,7 +1261,6 @@ "m_Id": 0, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3 @@ -1272,7 +1273,6 @@ "m_Id": 8, "m_DisplayName": "Index", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Index", "m_StageCapability": 3, @@ -1284,7 +1284,7 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector4ShaderProperty", "m_ObjectId": "43f56468d4e14e80a63f41267b3f31a4", "m_Guid": { @@ -1295,7 +1295,8 @@ "m_OverrideReferenceName": "_AnimationData", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": true, + "overrideHLSLDeclaration": true, + "hlslDeclarationOverride": 3, "m_Hidden": false, "m_Value": { "x": 0.0, @@ -1328,6 +1329,7 @@ "m_Id": "2067fca98ed74c8a8d9a4a80a0159abc" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -1345,7 +1347,6 @@ "m_Id": 0, "m_DisplayName": "MaxFrames", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1363,7 +1364,6 @@ "m_Id": 4, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 2, @@ -1381,7 +1381,6 @@ "m_Id": 3, "m_DisplayName": "Sampler", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Sampler", "m_StageCapability": 3 @@ -1394,7 +1393,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -1419,7 +1417,6 @@ "m_Id": 8, "m_DisplayName": "Index", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Index", "m_StageCapability": 3, @@ -1437,7 +1434,6 @@ "m_Id": 0, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1465,7 +1461,6 @@ "m_Id": 1, "m_DisplayName": "Position", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Position", "m_StageCapability": 3, @@ -1493,7 +1488,6 @@ "m_Id": 5, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 2, @@ -1527,6 +1521,7 @@ "m_Id": "38a33ff7982645419c715f3d99b31e16" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -1543,7 +1538,6 @@ "m_Id": 1, "m_DisplayName": "Texture Array", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Texture Array", "m_StageCapability": 3, @@ -1560,7 +1554,6 @@ "m_Id": -1112573420, "m_DisplayName": "MaxFrames", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector1_967e0c2bcb6e48c2b85b82c6d4c734a4", "m_StageCapability": 3, @@ -1597,6 +1590,7 @@ "m_Id": "993b900d18074e2489d7d76e323905db" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, "m_CustomColors": { @@ -1612,7 +1606,6 @@ "m_Id": 1, "m_DisplayName": "Vector3", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector3", "m_StageCapability": 3, @@ -1640,7 +1633,6 @@ "m_Id": 2, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -1666,7 +1658,6 @@ "m_Id": 3, "m_DisplayName": "Sampler", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Sampler", "m_StageCapability": 3 @@ -1679,7 +1670,6 @@ "m_Id": 0, "m_DisplayName": "RGBA", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "RGBA", "m_StageCapability": 2, @@ -1694,7 +1684,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_Labels": [] } { @@ -1720,6 +1711,7 @@ "m_Id": "a6a87747fc9744fa9561bbcfe705fc48" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -1737,7 +1729,6 @@ "m_Id": 0, "m_DisplayName": "Smoothness", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Smoothness", "m_StageCapability": 2, @@ -1771,6 +1762,7 @@ "m_Id": "050f0a5e6c38433aab26a0fe187b2ae3" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -1788,7 +1780,6 @@ "m_Id": 654627568, "m_DisplayName": "Vector1", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector1_771ac3b08a1144b086078a0d07c220da", "m_StageCapability": 3, @@ -1806,7 +1797,6 @@ "m_Id": 8, "m_DisplayName": "Index", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Index", "m_StageCapability": 3, @@ -1840,6 +1830,7 @@ "m_Id": "b303bce1f89843b78ddd84bf8d0eef15" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -1855,7 +1846,6 @@ "m_Id": 509595180, "m_DisplayName": "Time", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector1_f9b649ed28584dca8a522f3fb582f350", "m_StageCapability": 3, @@ -1873,7 +1863,6 @@ "m_Id": -1634479697, "m_DisplayName": "PositionMapIndex", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector1_cc4eba55004546408c4665cdb22d3111", "m_StageCapability": 3, @@ -1891,7 +1880,6 @@ "m_Id": 6, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 2, @@ -1914,7 +1902,8 @@ "m_OverrideReferenceName": "_PositionMap", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"textureArray\":{\"instanceID\":0}}", @@ -1930,7 +1919,6 @@ "m_Id": 0, "m_DisplayName": "RGBA", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "RGBA", "m_StageCapability": 2, @@ -1945,7 +1933,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_Labels": [] } { @@ -1955,7 +1944,6 @@ "m_Id": 4, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 2, @@ -1973,7 +1961,6 @@ "m_Id": 0, "m_DisplayName": "Normal (Tangent Space)", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "NormalTS", "m_StageCapability": 2, @@ -2002,7 +1989,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -2027,7 +2013,6 @@ "m_Id": 1, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2055,7 +2040,6 @@ "m_Id": 1, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2080,7 +2064,6 @@ "m_Id": 0, "m_DisplayName": "Normal", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3 @@ -2093,7 +2076,6 @@ "m_Id": 0, "m_DisplayName": "Ambient Occlusion", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Occlusion", "m_StageCapability": 2, @@ -2111,7 +2093,6 @@ "m_Id": 0, "m_DisplayName": "PositionMap", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3 @@ -2124,7 +2105,6 @@ "m_Id": 2078266122, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Vector2_a09a6ce7e08545d99b5bda70586f4e79", "m_StageCapability": 3, @@ -2149,7 +2129,6 @@ "m_Id": 0, "m_DisplayName": "Mask", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3 @@ -2162,7 +2141,6 @@ "m_Id": 0, "m_DisplayName": "Emission", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Emission", "m_StageCapability": 2, @@ -2181,7 +2159,13 @@ "Y", "Z" ], - "m_ColorMode": 1 + "m_ColorMode": 1, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } } { @@ -2191,7 +2175,6 @@ "m_Id": 2, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -2217,7 +2200,6 @@ "m_Id": 4, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 2, @@ -2235,7 +2217,6 @@ "m_Id": 2, "m_DisplayName": "Alpha", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Alpha", "m_StageCapability": 3, @@ -2279,6 +2260,7 @@ "m_Id": "cd99e2a7f55149f1be0eae70fcb7d81e" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -2331,6 +2313,7 @@ "m_Id": "b92997ffb0ac41d1853fbf8ce13a525a" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -2362,7 +2345,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -2387,7 +2369,6 @@ "m_Id": 0, "m_DisplayName": "RGBA", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "RGBA", "m_StageCapability": 2, @@ -2402,7 +2383,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_Labels": [] } { @@ -2423,7 +2405,6 @@ "m_Id": 0, "m_DisplayName": "Tangent", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Tangent", "m_StageCapability": 1, @@ -2471,6 +2452,7 @@ "m_Id": "9a09239733744697a7ba8a15b5e121f3" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, "m_CustomColors": { @@ -2485,7 +2467,6 @@ "m_Id": 1, "m_DisplayName": "Texture Array", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Texture Array", "m_StageCapability": 3, @@ -2518,6 +2499,7 @@ "m_Id": "f645af538404406083f6aeb7d6dff3f9" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, "m_CustomColors": { @@ -2533,7 +2515,6 @@ "m_Id": 2, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -2559,7 +2540,6 @@ "m_Id": 0, "m_DisplayName": "Normal", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Normal", "m_StageCapability": 1, @@ -2628,6 +2608,7 @@ "m_Id": "52b8720932eb4f958cb73137449a9a18" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -2672,6 +2653,7 @@ "m_Id": "c0f217568ccb4c1f943da958747a4950" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -2703,6 +2685,7 @@ "m_Id": "95ad1504a6d240f2805b255a14b0672e" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -2718,7 +2701,6 @@ "m_Id": 5, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 2, @@ -2736,7 +2718,6 @@ "m_Id": 0, "m_DisplayName": "Base Color", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "BaseColor", "m_StageCapability": 2, @@ -2755,7 +2736,13 @@ "Y", "Z" ], - "m_ColorMode": 0 + "m_ColorMode": 0, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } } { @@ -2765,7 +2752,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2788,7 +2774,8 @@ "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalLitSubTarget", "m_ObjectId": "e67a5b36bd4c401e906f606f1439a9b8", "m_WorkflowMode": 1, - "m_NormalDropOffSpace": 0 + "m_NormalDropOffSpace": 0, + "m_ClearCoat": false } { @@ -2814,6 +2801,7 @@ "m_Id": "dde262ac810448bab0e962f89add8832" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -2829,7 +2817,6 @@ "m_Id": 2, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 3, @@ -2847,7 +2834,6 @@ "m_Id": 5, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 2, @@ -2865,7 +2851,6 @@ "m_Id": 7, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 2, @@ -2877,7 +2862,7 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "f0d9e4dad8e7447fb562ded3227f3750", "m_Guid": { @@ -2888,10 +2873,11 @@ "m_OverrideReferenceName": "_MaxFrames", "m_GeneratePropertyBlock": true, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": true, + "hlslDeclarationOverride": 2, "m_Hidden": false, "m_Value": 0.0, - "m_FloatType": 0, + "m_FloatType": 2, "m_RangeValues": { "x": 0.0, "y": 1.0 @@ -2905,7 +2891,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -2920,7 +2905,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_Labels": [] } { @@ -2946,6 +2932,7 @@ "m_Id": "248d436857724c6ea25312da37a66b95" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { @@ -2961,7 +2948,6 @@ "m_Id": 0, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2976,7 +2962,8 @@ "y": 0.0, "z": 0.0, "w": 0.0 - } + }, + "m_Labels": [] } { @@ -2986,7 +2973,6 @@ "m_Id": -292266562, "m_DisplayName": "PositionMap", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Texture2DArray_c333595616b942739573e272a2bcc553", "m_StageCapability": 3, @@ -3003,7 +2989,6 @@ "m_Id": 1220204877, "m_DisplayName": "SamplerState", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "SamplerState_Linear_Repeat", "m_StageCapability": 3 @@ -3016,7 +3001,6 @@ "m_Id": 7, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 2, @@ -3050,6 +3034,7 @@ "m_Id": "a20eaa281b804a789240c6482403269d" } ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_CustomColors": { diff --git a/Samples~/Example1/Textures/BaseMesh_Albedo.png.meta b/Samples~/Example1/Textures/BaseMesh_Albedo.png.meta index 220bf68..939e02e 100644 --- a/Samples~/Example1/Textures/BaseMesh_Albedo.png.meta +++ b/Samples~/Example1/Textures/BaseMesh_Albedo.png.meta @@ -55,6 +55,8 @@ TextureImporter: textureType: 0 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 diff --git a/Samples~/Example1/Textures/Characters/Character1/VAT_N-Character1Run_F-22.exr.meta b/Samples~/Example1/Textures/Characters/Character1/VAT_N-Character1Run_F-22.exr.meta index aa18afc..62d713a 100644 --- a/Samples~/Example1/Textures/Characters/Character1/VAT_N-Character1Run_F-22.exr.meta +++ b/Samples~/Example1/Textures/Characters/Character1/VAT_N-Character1Run_F-22.exr.meta @@ -55,6 +55,8 @@ TextureImporter: textureType: 0 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 diff --git a/Samples~/Example1/Textures/Characters/Character2/VAT_N-Character2Run_F-22.exr b/Samples~/Example1/Textures/Characters/Character2/VAT_N-Character2Run1_F-22.exr similarity index 100% rename from Samples~/Example1/Textures/Characters/Character2/VAT_N-Character2Run_F-22.exr rename to Samples~/Example1/Textures/Characters/Character2/VAT_N-Character2Run1_F-22.exr diff --git a/Samples~/Example1/Textures/Characters/Character2/VAT_N-Character2Run_F-22.exr.meta b/Samples~/Example1/Textures/Characters/Character2/VAT_N-Character2Run1_F-22.exr.meta similarity index 100% rename from Samples~/Example1/Textures/Characters/Character2/VAT_N-Character2Run_F-22.exr.meta rename to Samples~/Example1/Textures/Characters/Character2/VAT_N-Character2Run1_F-22.exr.meta diff --git a/Samples~/Example1/Textures/Characters/Character2/VAT_N-Character2Run_F-36.exr b/Samples~/Example1/Textures/Characters/Character2/VAT_N-Character2Run2_F-36.exr similarity index 100% rename from Samples~/Example1/Textures/Characters/Character2/VAT_N-Character2Run_F-36.exr rename to Samples~/Example1/Textures/Characters/Character2/VAT_N-Character2Run2_F-36.exr diff --git a/Samples~/Example1/Textures/Characters/Character2/VAT_N-Character2Run_F-36.exr.meta b/Samples~/Example1/Textures/Characters/Character2/VAT_N-Character2Run2_F-36.exr.meta similarity index 100% rename from Samples~/Example1/Textures/Characters/Character2/VAT_N-Character2Run_F-36.exr.meta rename to Samples~/Example1/Textures/Characters/Character2/VAT_N-Character2Run2_F-36.exr.meta