diff --git a/Assets/Materials/Background.meta b/Assets/Materials/Background.meta new file mode 100644 index 0000000..6c69f71 --- /dev/null +++ b/Assets/Materials/Background.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9df3137806668c62dbe6ef1fe5223198 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Bricks_01_mat.mat b/Assets/Materials/Background/Bricks_01_mat.mat similarity index 100% rename from Assets/Materials/Bricks_01_mat.mat rename to Assets/Materials/Background/Bricks_01_mat.mat diff --git a/Assets/Materials/Bricks_01_mat.mat.meta b/Assets/Materials/Background/Bricks_01_mat.mat.meta similarity index 100% rename from Assets/Materials/Bricks_01_mat.mat.meta rename to Assets/Materials/Background/Bricks_01_mat.mat.meta diff --git a/Assets/Materials/M_Wood2.mat b/Assets/Materials/Background/M_Wood2.mat similarity index 97% rename from Assets/Materials/M_Wood2.mat rename to Assets/Materials/Background/M_Wood2.mat index 9a76e05..004cd1d 100644 --- a/Assets/Materials/M_Wood2.mat +++ b/Assets/Materials/Background/M_Wood2.mat @@ -22,9 +22,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: M_Wood2 m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3} - m_ValidKeywords: - - _GLOSSINESS_FROM_BASE_ALPHA - - _SPECULAR_COLOR + m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -61,7 +59,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: df690bcdbe37a3fb49fe354efbd81b6b, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Materials/M_Wood2.mat.meta b/Assets/Materials/Background/M_Wood2.mat.meta similarity index 100% rename from Assets/Materials/M_Wood2.mat.meta rename to Assets/Materials/Background/M_Wood2.mat.meta diff --git a/Assets/Materials/M_Wood3.mat b/Assets/Materials/Background/M_Wood3.mat similarity index 100% rename from Assets/Materials/M_Wood3.mat rename to Assets/Materials/Background/M_Wood3.mat diff --git a/Assets/Materials/M_Wood3.mat.meta b/Assets/Materials/Background/M_Wood3.mat.meta similarity index 100% rename from Assets/Materials/M_Wood3.mat.meta rename to Assets/Materials/Background/M_Wood3.mat.meta diff --git a/Assets/Materials/NewBall.mat b/Assets/Materials/NewBall.mat index 5170268..af7f964 100644 --- a/Assets/Materials/NewBall.mat +++ b/Assets/Materials/NewBall.mat @@ -50,10 +50,12 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _BorderThickness: 0.3 - _EnableExternalAlpha: 0 - - _Thickness: 0.051 + - _Thickness: 0.25 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _BorderColor: {r: 5.992157, g: 5.992157, b: 0, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 0} - _Flip: {r: 1, g: 1, b: 1, a: 1} - _RendererColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Materials/Player.mat b/Assets/Materials/Player.mat new file mode 100644 index 0000000..ddc5807 --- /dev/null +++ b/Assets/Materials/Player.mat @@ -0,0 +1,61 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Player + m_Shader: {fileID: -6465566751694194690, guid: 11508ba6b7a598ad3bbb1d90c2f66d3e, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalMap: + 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_Ints: [] + m_Floats: + - _BorderThickness: 0.137 + - _EnableExternalAlpha: 0 + - _Thickness: 0.05 + m_Colors: + - _BorderColor: {r: 4.894118, g: 0.1254902, b: 0, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Player.mat.meta b/Assets/Materials/Player.mat.meta new file mode 100644 index 0000000..3166489 --- /dev/null +++ b/Assets/Materials/Player.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3fe1e2c8e63973b7892ed995b6c4d7a9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Collectables/NewBall.prefab b/Assets/Prefabs/Collectables/NewBall.prefab index 3f0468f..33f9c48 100644 --- a/Assets/Prefabs/Collectables/NewBall.prefab +++ b/Assets/Prefabs/Collectables/NewBall.prefab @@ -29,8 +29,8 @@ Transform: m_GameObject: {fileID: 5863603256186968685} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} - m_ConstrainProportionsScale: 1 + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -81,7 +81,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.984375, y: 0.984375} + m_Size: {x: 1, y: 1} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -117,8 +117,8 @@ MonoBehaviour: m_EditorClassIdentifier: permanentDuration: 5 temporaryDuration: 10 - permanentColor: {r: 11.984314, g: 11.984314, b: 0, a: 1} - temporaryColor: {r: 0, g: 11.984314, b: 11.984314, a: 1} + permanentColor: {r: 5.992157, g: 5.992157, b: 0, a: 1} + temporaryColor: {r: 0, g: 5.992157, b: 5.992157, a: 1} --- !u!114 &5863603256186968681 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 05068d9..d29aea6 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -1,89 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &4432154768687560732 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4352057116839657264} - - component: {fileID: 3692058641684352833} - m_Layer: 8 - m_Name: MainColor - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4352057116839657264 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4432154768687560732} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.94, y: 0.8, z: 0.94} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5402279313309450413} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &3692058641684352833 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4432154768687560732} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 1 - m_Sprite: {fileID: 21300000, guid: 47e353a78c92b9838963e533e37462e5, type: 3} - m_Color: {r: 0.13207549, g: 0.13207549, b: 0.13207549, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &5402279313309450415 GameObject: m_ObjectHideFlags: 0 @@ -115,8 +31,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 5, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4352057116839657264} + m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -140,7 +55,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 3fe1e2c8e63973b7892ed995b6c4d7a9, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -162,7 +77,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 47e353a78c92b9838963e533e37462e5, type: 3} - m_Color: {r: 1, g: 0.85783035, b: 0, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 diff --git a/Assets/Scripts/Game/GameManager.cs b/Assets/Scripts/Game/GameManager.cs index 8d6f482..382726a 100644 --- a/Assets/Scripts/Game/GameManager.cs +++ b/Assets/Scripts/Game/GameManager.cs @@ -50,7 +50,7 @@ namespace Game { } private void SetupPlayers() { - Settings.Type = Type.AI; + Settings.Type = Type.Hybrid; Settings.AIDifficulty = Difficulty.VeryHard; var p1Obj = Instantiate(playerPrefab); diff --git a/Assets/Scripts/Game/NewBall.cs b/Assets/Scripts/Game/NewBall.cs index 4ffe674..e0648b0 100644 --- a/Assets/Scripts/Game/NewBall.cs +++ b/Assets/Scripts/Game/NewBall.cs @@ -11,11 +11,13 @@ namespace Game { public Color permanentColor; [ColorUsage(true, true)] public Color temporaryColor; + + private static readonly int BorderColor = Shader.PropertyToID("_BorderColor"); public bool IsPermanent { get; set; } protected override void Setup() { - GetComponent().material.color = IsPermanent ? permanentColor : temporaryColor; + GetComponent().material.SetColor(BorderColor, IsPermanent ? permanentColor : temporaryColor); } protected override float Duration() { diff --git a/Assets/Shaders/CircleBorder.shadergraph b/Assets/Shaders/Circle.shadergraph similarity index 59% rename from Assets/Shaders/CircleBorder.shadergraph rename to Assets/Shaders/Circle.shadergraph index 2cbe4b5..6433aff 100644 --- a/Assets/Shaders/CircleBorder.shadergraph +++ b/Assets/Shaders/Circle.shadergraph @@ -11,6 +11,9 @@ }, { "m_Id": "0698db47059a4cab92120905db952371" + }, + { + "m_Id": "1e64a2c70dac4b1492cd1598a454c615" } ], "m_Keywords": [], @@ -52,10 +55,25 @@ "m_Id": "4281f0e6d1d44889a6182e3a91370a75" }, { - "m_Id": "c9bf1c61aedc4a8986253d5c5aa1a109" + "m_Id": "9bd611d9c1c64fcfaa65ba232a13ca5e" }, { - "m_Id": "9bd611d9c1c64fcfaa65ba232a13ca5e" + "m_Id": "ce848644fae14024a52b162300f91c22" + }, + { + "m_Id": "a012de5dfd2c42b5a02603d023f7a022" + }, + { + "m_Id": "22665d173f2247edac584b2d42a542ef" + }, + { + "m_Id": "22f829da75e54d0c83f00723314c337d" + }, + { + "m_Id": "f50537d02078492bb88255d4981de0bd" + }, + { + "m_Id": "3504031825c740acab846725f4c84b1b" } ], "m_GroupDatas": [], @@ -78,13 +96,55 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "4281f0e6d1d44889a6182e3a91370a75" + "m_Id": "07d9a5d390154abfaabea3139f2cb911" + }, + "m_SlotId": 4 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "a012de5dfd2c42b5a02603d023f7a022" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "22665d173f2247edac584b2d42a542ef" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "9bd611d9c1c64fcfaa65ba232a13ca5e" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "22f829da75e54d0c83f00723314c337d" }, "m_SlotId": 2 }, "m_InputSlot": { "m_Node": { - "m_Id": "11952df7e71340419ababb239224a297" + "m_Id": "f50537d02078492bb88255d4981de0bd" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "3504031825c740acab846725f4c84b1b" + }, + "m_SlotId": 5 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "e45a3ebcaa074493b0d25db31f22962d" }, "m_SlotId": 0 } @@ -154,11 +214,25 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "e45a3ebcaa074493b0d25db31f22962d" + "m_Id": "22f829da75e54d0c83f00723314c337d" }, "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "a012de5dfd2c42b5a02603d023f7a022" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "22f829da75e54d0c83f00723314c337d" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -176,13 +250,69 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "c9bf1c61aedc4a8986253d5c5aa1a109" + "m_Id": "ce848644fae14024a52b162300f91c22" }, "m_SlotId": 0 }, "m_InputSlot": { "m_Node": { - "m_Id": "9bd611d9c1c64fcfaa65ba232a13ca5e" + "m_Id": "a012de5dfd2c42b5a02603d023f7a022" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "f50537d02078492bb88255d4981de0bd" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "3504031825c740acab846725f4c84b1b" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "f50537d02078492bb88255d4981de0bd" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "3504031825c740acab846725f4c84b1b" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "f50537d02078492bb88255d4981de0bd" + }, + "m_SlotId": 3 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "3504031825c740acab846725f4c84b1b" + }, + "m_SlotId": 2 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "f50537d02078492bb88255d4981de0bd" + }, + "m_SlotId": 4 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "11952df7e71340419ababb239224a297" }, "m_SlotId": 0 } @@ -246,10 +376,10 @@ "m_Guid": { "m_GuidSerialized": "b4456834-f0b2-4c8d-83d6-c92ff1006fa4" }, - "m_Name": "Thickness", + "m_Name": "BorderThickness", "m_DefaultRefNameVersion": 1, - "m_RefNameGeneratedByDisplayName": "Thickness", - "m_DefaultReferenceName": "_Thickness", + "m_RefNameGeneratedByDisplayName": "BorderThickness", + "m_DefaultReferenceName": "_BorderThickness", "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, @@ -278,10 +408,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -886.9999389648438, - "y": 224.99998474121095, - "width": 207.99993896484376, - "height": 326.0 + "x": -1063.0, + "y": 217.00003051757813, + "width": 208.00006103515626, + "height": 325.9999694824219 } }, "m_Slots": [ @@ -324,6 +454,53 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "0cb030fbcf1248a5851d059f79cf8118", + "m_Id": 5, + "m_DisplayName": "RGB", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "RGB", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "0fd7b046541e4a9eaf5ffa9b88794e84", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot", @@ -454,103 +631,105 @@ } { - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", - "m_ObjectId": "386a9372f35a4eb5ba59ccb5c78858f9", - "m_Id": 0, - "m_DisplayName": "UV", - "m_SlotType": 0, + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", + "m_ObjectId": "1e64a2c70dac4b1492cd1598a454c615", + "m_Guid": { + "m_GuidSerialized": "418ba94e-1d05-4955-96ee-2ca07bf7896f" + }, + "m_Name": "BorderColor", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "BorderColor", + "m_DefaultReferenceName": "_BorderColor", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, - "m_ShaderOutputName": "UV", - "m_StageCapability": 3, "m_Value": { - "x": 0.0, - "y": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0 + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 1.0 }, - "m_Labels": [], - "m_Channel": 0 + "isMainColor": false, + "m_ColorMode": 1 } { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.SubtractNode", - "m_ObjectId": "4281f0e6d1d44889a6182e3a91370a75", + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "22665d173f2247edac584b2d42a542ef", "m_Group": { "m_Id": "" }, - "m_Name": "Subtract", + "m_Name": "Property", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -571.9999389648438, - "y": 85.99998474121094, - "width": 207.99993896484376, - "height": 302.0 + "x": -643.0, + "y": -33.99998474121094, + "width": 140.00009155273438, + "height": 34.0000114440918 } }, "m_Slots": [ { - "m_Id": "12e196c8c6ee4682b895e47e38934a0c" - }, - { - "m_Id": "bfb79870ce1c4e4a9a4d192964cbacbe" - }, - { - "m_Id": "fe644fe65fce4a43a2926d903ddda7a2" + "m_Id": "9a8d4656211c413ba2435ddfb5795eb0" } ], - "synonyms": [ - "subtraction", - "remove", - "minus", - "take away" - ], + "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "1e64a2c70dac4b1492cd1598a454c615" } } { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.OneMinusNode", - "m_ObjectId": "48224045575341f9b5f1bd1b05d24931", + "m_Type": "UnityEditor.ShaderGraph.AddNode", + "m_ObjectId": "22f829da75e54d0c83f00723314c337d", "m_Group": { "m_Id": "" }, - "m_Name": "One Minus", + "m_Name": "Add", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1086.0, - "y": 278.0, - "width": 128.00006103515626, - "height": 94.0 + "x": -355.88470458984377, + "y": 524.701904296875, + "width": 0.0, + "height": 0.0 } }, "m_Slots": [ { - "m_Id": "ccd10a866a9c4f51b1173ad1d63a79b3" + "m_Id": "9cde37b1c45e4199b388baa2a5ebc089" }, { - "m_Id": "67dc544734524f4c929508dd7f3b7579" + "m_Id": "ed57a0fb22e14be5beefc9dcb7160807" + }, + { + "m_Id": "84810e336777403d90490f982985a130" } ], "synonyms": [ - "complement", - "invert", - "opposite" + "addition", + "sum", + "plus" ], "m_Precision": 0, - "m_PreviewExpanded": false, + "m_PreviewExpanded": true, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -560,12 +739,12 @@ { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", - "m_ObjectId": "592bacc11aee4aa0a0981d638b3fc332", - "m_Id": 0, - "m_DisplayName": "Color", + "m_ObjectId": "2bd9d2f05da84197bdf647ee0412c323", + "m_Id": 4, + "m_DisplayName": "RGBA", "m_SlotType": 1, "m_Hidden": false, - "m_ShaderOutputName": "Out", + "m_ShaderOutputName": "RGBA", "m_StageCapability": 3, "m_Value": { "x": 0.0, @@ -584,31 +763,238 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "5b428fa2f5434b4ba05a3bd859e25652", - "m_Id": 4, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 2, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "67dc544734524f4c929508dd7f3b7579", - "m_Id": 1, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, + "m_Type": "UnityEditor.ShaderGraph.CombineNode", + "m_ObjectId": "3504031825c740acab846725f4c84b1b", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Combine", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 64.99991607666016, + "y": 433.0, + "width": 208.0, + "height": 350.0 + } + }, + "m_Slots": [ + { + "m_Id": "5c4d413764da44a1a96eb0c601ba2e5a" + }, + { + "m_Id": "7b2c56ce1211432087fc0d8015705da5" + }, + { + "m_Id": "bf6f7fa7ea994591b14c9b01a32003d1" + }, + { + "m_Id": "c3807da02f5c4dee85de93930f6ba7de" + }, + { + "m_Id": "2bd9d2f05da84197bdf647ee0412c323" + }, + { + "m_Id": "0cb030fbcf1248a5851d059f79cf8118" + }, + { + "m_Id": "43c28b0ace7144078d26ba7ded493ce2" + } + ], + "synonyms": [ + "append" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", + "m_ObjectId": "386a9372f35a4eb5ba59ccb5c78858f9", + "m_Id": 0, + "m_DisplayName": "UV", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "UV", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [], + "m_Channel": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SubtractNode", + "m_ObjectId": "4281f0e6d1d44889a6182e3a91370a75", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Subtract", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -745.9999389648438, + "y": 17.000009536743165, + "width": 208.0, + "height": 302.0000305175781 + } + }, + "m_Slots": [ + { + "m_Id": "12e196c8c6ee4682b895e47e38934a0c" + }, + { + "m_Id": "bfb79870ce1c4e4a9a4d192964cbacbe" + }, + { + "m_Id": "fe644fe65fce4a43a2926d903ddda7a2" + } + ], + "synonyms": [ + "subtraction", + "remove", + "minus", + "take away" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "43c28b0ace7144078d26ba7ded493ce2", + "m_Id": 6, + "m_DisplayName": "RG", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "RG", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.OneMinusNode", + "m_ObjectId": "48224045575341f9b5f1bd1b05d24931", + "m_Group": { + "m_Id": "" + }, + "m_Name": "One Minus", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1263.0, + "y": 299.0000305175781, + "width": 128.0, + "height": 93.99996948242188 + } + }, + "m_Slots": [ + { + "m_Id": "ccd10a866a9c4f51b1173ad1d63a79b3" + }, + { + "m_Id": "67dc544734524f4c929508dd7f3b7579" + } + ], + "synonyms": [ + "complement", + "invert", + "opposite" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "4fed6b25bd6c4f9f8d0aed468234edd7", + "m_Id": 1, + "m_DisplayName": "R", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "R", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "5b428fa2f5434b4ba05a3bd859e25652", + "m_Id": 4, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "5c4d413764da44a1a96eb0c601ba2e5a", + "m_Id": 0, + "m_DisplayName": "R", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "R", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "67dc544734524f4c929508dd7f3b7579", + "m_Id": 1, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, "y": 0.0, "z": 0.0, "w": 0.0 @@ -701,9 +1087,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -886.9999389648438, - "y": -150.00001525878907, - "width": 207.99993896484376, + "x": -1063.0, + "y": -157.99998474121095, + "width": 208.00006103515626, "height": 326.0000305175781 } }, @@ -808,6 +1194,45 @@ "m_Space": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "7b2c56ce1211432087fc0d8015705da5", + "m_Id": 1, + "m_DisplayName": "G", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "G", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "84810e336777403d90490f982985a130", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", @@ -861,7 +1286,7 @@ "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { - "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_SerializedTexture": "{\"texture\":{\"fileID\":2800000,\"guid\":\"47e353a78c92b9838963e533e37462e5\",\"type\":3}}", "m_Guid": "" }, "isMainTexture": false, @@ -938,9 +1363,9 @@ "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { - "r": 0.0, - "g": 0.0, - "b": 0.0, + "r": 1.0, + "g": 1.0, + "b": 1.0, "a": 0.0 }, "isMainColor": false, @@ -949,27 +1374,107 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalSpriteUnlitSubTarget", - "m_ObjectId": "9b62e8bbee61428d9d34249e04853bb7" -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", - "m_ObjectId": "9bd611d9c1c64fcfaa65ba232a13ca5e", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Multiply", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -321.9999694824219, - "y": -24.000024795532228, - "width": 208.00003051757813, - "height": 302.0000305175781 - } + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "947623a289e1423e83bd5b082426fbc0", + "m_Id": 0, + "m_DisplayName": "Color", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "970c9b7fad3841288ea1ca6f89db9f03", + "m_Id": 3, + "m_DisplayName": "B", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "97225d074f6b4b549981992dd3b06058", + "m_Id": 2, + "m_DisplayName": "G", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "G", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "9a8d4656211c413ba2435ddfb5795eb0", + "m_Id": 0, + "m_DisplayName": "BorderColor", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalSpriteUnlitSubTarget", + "m_ObjectId": "9b62e8bbee61428d9d34249e04853bb7" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "9bd611d9c1c64fcfaa65ba232a13ca5e", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -440.99993896484377, + "y": 0.00002574920654296875, + "width": 207.99996948242188, + "height": 301.9999694824219 + } }, "m_Slots": [ { @@ -995,6 +1500,72 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "9cde37b1c45e4199b388baa2a5ebc089", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "a012de5dfd2c42b5a02603d023f7a022", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -745.9999389648438, + "y": 433.0000305175781, + "width": 208.0, + "height": 301.9999694824219 + } + }, + "m_Slots": [ + { + "m_Id": "c61fb89f1e09418dbc7e936ee4c26580" + }, + { + "m_Id": "b7f4e4af56514fe3ab421eaf68ad8976" + }, + { + "m_Id": "ba18570018bf4133ba7056f91230f819" + } + ], + "synonyms": [ + "multiplication", + "times", + "x" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", @@ -1040,6 +1611,9 @@ { "m_Id": "94033d0d02ac402fb7028eed529e5c26" }, + { + "m_Id": "1e64a2c70dac4b1492cd1598a454c615" + }, { "m_Id": "0698db47059a4cab92120905db952371" } @@ -1058,10 +1632,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1244.0, - "y": 354.0, + "x": -1408.0, + "y": 322.0, "width": 128.0, - "height": 33.999969482421878 + "height": 34.00006103515625 } }, "m_Slots": [ @@ -1081,6 +1655,102 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "b7f4e4af56514fe3ab421eaf68ad8976", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 2.0, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "ba18570018bf4133ba7056f91230f819", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot", @@ -1105,6 +1775,21 @@ "m_Space": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "bf6f7fa7ea994591b14c9b01a32003d1", + "m_Id": 2, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -1129,6 +1814,36 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "c261dd6b0fe54505b456412dbaf0f4d3", + "m_Id": 4, + "m_DisplayName": "A", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "c3807da02f5c4dee85de93930f6ba7de", + "m_Id": 3, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -1146,36 +1861,49 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.PropertyNode", - "m_ObjectId": "c9bf1c61aedc4a8986253d5c5aa1a109", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Property", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -503.9999694824219, - "y": -46.00002670288086, - "width": 104.99996948242188, - "height": 34.00000762939453 - } - }, - "m_Slots": [ - { - "m_Id": "592bacc11aee4aa0a0981d638b3fc332" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "c61fb89f1e09418dbc7e936ee4c26580", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 }, - "m_Property": { - "m_Id": "94033d0d02ac402fb7028eed529e5c26" + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 } } @@ -1203,12 +1931,47 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "ce848644fae14024a52b162300f91c22", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -936.9999389648438, + "y": 617.0, + "width": 104.99993896484375, + "height": 34.00006103515625 + } + }, + "m_Slots": [ + { + "m_Id": "947623a289e1423e83bd5b082426fbc0" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "94033d0d02ac402fb7028eed529e5c26" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", "m_ObjectId": "decc3579d00b4eebba1ea3b4e02e1890", "m_Id": 0, - "m_DisplayName": "Thickness", + "m_DisplayName": "BorderThickness", "m_SlotType": 1, "m_Hidden": false, "m_ShaderOutputName": "Out", @@ -1266,6 +2029,30 @@ "m_SerializedDescriptor": "SurfaceDescription.BaseColor" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "ed57a0fb22e14be5beefc9dcb7160807", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -1311,6 +2098,52 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SplitNode", + "m_ObjectId": "f50537d02078492bb88255d4981de0bd", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Split", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -103.0, + "y": 577.0, + "width": 119.99992370605469, + "height": 149.00006103515626 + } + }, + "m_Slots": [ + { + "m_Id": "0fd7b046541e4a9eaf5ffa9b88794e84" + }, + { + "m_Id": "4fed6b25bd6c4f9f8d0aed468234edd7" + }, + { + "m_Id": "97225d074f6b4b549981992dd3b06058" + }, + { + "m_Id": "970c9b7fad3841288ea1ca6f89db9f03" + }, + { + "m_Id": "c261dd6b0fe54505b456412dbaf0f4d3" + } + ], + "synonyms": [ + "separate" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", diff --git a/Assets/Shaders/CircleBorder.shadergraph.meta b/Assets/Shaders/Circle.shadergraph.meta similarity index 100% rename from Assets/Shaders/CircleBorder.shadergraph.meta rename to Assets/Shaders/Circle.shadergraph.meta