From afc9c6627e4606f1af41afe0574bcbc902f2daeb Mon Sep 17 00:00:00 2001 From: MarcoHampel Date: Mon, 12 Feb 2024 21:07:23 -0500 Subject: [PATCH] Working on nav systme --- .../Flesh_graph_0/Flesh_graph_dissolve.mat | 1 + Assets/Scenes/Levels/Level1.unity | 16 +- .../STRIPS/MeleeAI/AIMappings.asset | 3 + .../STRIPS/MeleeAI/Attack/Attack.asset | 2 +- .../STRIPS/MeleeAI/Attack/AttackGoal.asset | 8 +- .../STRIPS/MeleeAI/Attack/Dodge.asset | 23 + .../STRIPS/MeleeAI/Attack/Dodge.asset.meta | 8 + .../STRIPS/MeleeAI/Attack/RunToPlayer.asset | 3 + .../STRIPS/MeleeAI/FleeGoal/FleeGoal.asset | 5 +- .../STRIPS/MeleeAI/Idle/IdleGoal.asset | 3 +- .../Scripts/Enemies/AI/AIV2/MeleeResolver.cs | 50 +- .../AI/AIV2/Strips/IStripsActionResolver.cs | 4 +- .../AI/AIV2/Strips/StripsActionResolver.cs | 8 +- .../Enemies/AI/AIV2/Strips/StripsGoal.cs | 15 +- .../Player/PlayerInteractionHandler.cs | 1 + Assets/Shaders/Dissolve2.shadergraph | 430 +++++++++++++++--- 16 files changed, 491 insertions(+), 89 deletions(-) create mode 100644 Assets/ScriptableObjects/STRIPS/MeleeAI/Attack/Dodge.asset create mode 100644 Assets/ScriptableObjects/STRIPS/MeleeAI/Attack/Dodge.asset.meta diff --git a/Assets/Materials/AlienMats/Flesh_graph_0/Flesh_graph_dissolve.mat b/Assets/Materials/AlienMats/Flesh_graph_0/Flesh_graph_dissolve.mat index b48d513..6a96eae 100644 --- a/Assets/Materials/AlienMats/Flesh_graph_0/Flesh_graph_dissolve.mat +++ b/Assets/Materials/AlienMats/Flesh_graph_0/Flesh_graph_dissolve.mat @@ -268,6 +268,7 @@ Material: - _Smoothness: {r: 0, g: 0, b: 0, a: 0} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} - _ThicknessRemap: {r: 0, g: 1, b: 0, a: 0} + - _Tiling: {r: 0.25, g: 0.25, b: 0, a: 0} - _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1} - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} diff --git a/Assets/Scenes/Levels/Level1.unity b/Assets/Scenes/Levels/Level1.unity index fd6ebc3..2660c3e 100644 --- a/Assets/Scenes/Levels/Level1.unity +++ b/Assets/Scenes/Levels/Level1.unity @@ -2112,6 +2112,20 @@ NavMeshAgent: m_BaseOffset: 5.74 m_WalkableMask: 4294967295 m_ObstacleAvoidanceType: 4 +--- !u!136 &1066431874 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1066431868} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 3 + m_Height: 15 + m_Direction: 1 + m_Center: {x: 0, y: 2, z: 0} --- !u!1 &1103780941 GameObject: m_ObjectHideFlags: 0 @@ -4111,7 +4125,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1854962011} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2.144326, y: 2.64, z: 38.397} + m_LocalPosition: {x: 2.144326, y: 2.64, z: 38.43} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/ScriptableObjects/STRIPS/MeleeAI/AIMappings.asset b/Assets/ScriptableObjects/STRIPS/MeleeAI/AIMappings.asset index 7efd95c..c8d055d 100644 --- a/Assets/ScriptableObjects/STRIPS/MeleeAI/AIMappings.asset +++ b/Assets/ScriptableObjects/STRIPS/MeleeAI/AIMappings.asset @@ -22,3 +22,6 @@ MonoBehaviour: - varName: AIHealth variable: 1 value: 10 + - varName: AimedAt + variable: 3 + value: False diff --git a/Assets/ScriptableObjects/STRIPS/MeleeAI/Attack/Attack.asset b/Assets/ScriptableObjects/STRIPS/MeleeAI/Attack/Attack.asset index 4065d51..f2ada42 100644 --- a/Assets/ScriptableObjects/STRIPS/MeleeAI/Attack/Attack.asset +++ b/Assets/ScriptableObjects/STRIPS/MeleeAI/Attack/Attack.asset @@ -20,4 +20,4 @@ MonoBehaviour: - variableName1: IsPlayerVisible op: 2 variableName2: true - functions: 0400000001000000 + functions: 02000000 diff --git a/Assets/ScriptableObjects/STRIPS/MeleeAI/Attack/AttackGoal.asset b/Assets/ScriptableObjects/STRIPS/MeleeAI/Attack/AttackGoal.asset index 3582252..2529487 100644 --- a/Assets/ScriptableObjects/STRIPS/MeleeAI/Attack/AttackGoal.asset +++ b/Assets/ScriptableObjects/STRIPS/MeleeAI/Attack/AttackGoal.asset @@ -14,5 +14,9 @@ MonoBehaviour: m_EditorClassIdentifier: goalName: Attack actions: - - {fileID: 11400000, guid: c00e5a31d23b73b4e9a62899052b7f73, type: 2} - - {fileID: 11400000, guid: 47535c55d61913347a660731766816fa, type: 2} + - action: {fileID: 11400000, guid: 7905d251169a1504e97497d370215390, type: 2} + weight: 0.5 + - action: {fileID: 11400000, guid: c00e5a31d23b73b4e9a62899052b7f73, type: 2} + weight: 0.5 + - action: {fileID: 11400000, guid: 47535c55d61913347a660731766816fa, type: 2} + weight: 0.5 diff --git a/Assets/ScriptableObjects/STRIPS/MeleeAI/Attack/Dodge.asset b/Assets/ScriptableObjects/STRIPS/MeleeAI/Attack/Dodge.asset new file mode 100644 index 0000000..9fa0f9f --- /dev/null +++ b/Assets/ScriptableObjects/STRIPS/MeleeAI/Attack/Dodge.asset @@ -0,0 +1,23 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 88c10d9c5ffa3de4686d031fe60f0c9a, type: 3} + m_Name: Dodge + m_EditorClassIdentifier: + associatedMapping: {fileID: 11400000, guid: f4872e770a0bff14da2987f072305732, type: 2} + preConditions: + - variableName1: Distance2Player + op: 4 + variableName2: 5 + - variableName1: AimedAt + op: 2 + variableName2: true + functions: 01000000 diff --git a/Assets/ScriptableObjects/STRIPS/MeleeAI/Attack/Dodge.asset.meta b/Assets/ScriptableObjects/STRIPS/MeleeAI/Attack/Dodge.asset.meta new file mode 100644 index 0000000..8cd09eb --- /dev/null +++ b/Assets/ScriptableObjects/STRIPS/MeleeAI/Attack/Dodge.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7905d251169a1504e97497d370215390 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ScriptableObjects/STRIPS/MeleeAI/Attack/RunToPlayer.asset b/Assets/ScriptableObjects/STRIPS/MeleeAI/Attack/RunToPlayer.asset index a7dbd0d..41c16c4 100644 --- a/Assets/ScriptableObjects/STRIPS/MeleeAI/Attack/RunToPlayer.asset +++ b/Assets/ScriptableObjects/STRIPS/MeleeAI/Attack/RunToPlayer.asset @@ -17,4 +17,7 @@ MonoBehaviour: - variableName1: Distance2Player op: 3 variableName2: 5 + - variableName1: IsPlayerVisible + op: 2 + variableName2: true functions: 00000000 diff --git a/Assets/ScriptableObjects/STRIPS/MeleeAI/FleeGoal/FleeGoal.asset b/Assets/ScriptableObjects/STRIPS/MeleeAI/FleeGoal/FleeGoal.asset index 61d5ffa..fe0d973 100644 --- a/Assets/ScriptableObjects/STRIPS/MeleeAI/FleeGoal/FleeGoal.asset +++ b/Assets/ScriptableObjects/STRIPS/MeleeAI/FleeGoal/FleeGoal.asset @@ -14,4 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: goalName: Flee actions: - - {fileID: 11400000, guid: 808f992cd4a0d5548ad1eca774c383b6, type: 2} + - action: {fileID: 11400000, guid: 808f992cd4a0d5548ad1eca774c383b6, type: 2} + weight: 1 + - action: {fileID: 11400000, guid: 02d3f8f4d4fe75c478345298245cd595, type: 2} + weight: 0 diff --git a/Assets/ScriptableObjects/STRIPS/MeleeAI/Idle/IdleGoal.asset b/Assets/ScriptableObjects/STRIPS/MeleeAI/Idle/IdleGoal.asset index f531e8b..338f21f 100644 --- a/Assets/ScriptableObjects/STRIPS/MeleeAI/Idle/IdleGoal.asset +++ b/Assets/ScriptableObjects/STRIPS/MeleeAI/Idle/IdleGoal.asset @@ -14,4 +14,5 @@ MonoBehaviour: m_EditorClassIdentifier: goalName: Idle actions: - - {fileID: 11400000, guid: f17018799409101429839f1a67b8ce71, type: 2} + - action: {fileID: 11400000, guid: f17018799409101429839f1a67b8ce71, type: 2} + weight: 1 diff --git a/Assets/Scripts/Enemies/AI/AIV2/MeleeResolver.cs b/Assets/Scripts/Enemies/AI/AIV2/MeleeResolver.cs index b9de005..07789cf 100644 --- a/Assets/Scripts/Enemies/AI/AIV2/MeleeResolver.cs +++ b/Assets/Scripts/Enemies/AI/AIV2/MeleeResolver.cs @@ -22,6 +22,7 @@ public class MeleeResolver : AStripsActionResolver private float screamAnimationDuration = 1.5f; [SerializeField] private float health = 10f; + private bool lookAt = false; public override void Attack() { @@ -47,11 +48,14 @@ public override void LookAt(Vector3 position) // Apply the rotation over time to smooth the transition. transform.rotation = Quaternion.Lerp(transform.rotation, toRotation, Time.deltaTime * 150f); + + } public override void LookAt() { LookAt(new Vector3(player.transform.position.x, transform.position.y, player.transform.position.z)); + lookAt = true; } public override void MoveTo(Vector3 position) @@ -62,6 +66,14 @@ public override void MoveTo() { MoveTo(player.transform.position); } + public override void Dodge() + { + Vector3 difVector= transform.position-player.transform.position; + //Vector3 dirVector = new Vector3(difVector.z,difVector.y,difVector.x); + Vector3 dirVector = transform.right; + navAgent.SetDestination(navAgent.transform.position - (dirVector.normalized * 10f)); + navAgent.speed = 4f; + } public override void Roar() { @@ -73,10 +85,13 @@ public override void Roar() } public override void Idle() { - this.navAgent.isStopped = true; - this.navAgent.speed = 0; + //this.navAgent.isStopped = true; + //this.navAgent.speed = 0; + lookAt = false; } + + private IEnumerator InAnimationHolder(float duration) { inAnimation = true; @@ -97,13 +112,42 @@ void Start() void Update() { this.animator.SetFloat("Speed", navAgent.velocity.magnitude / 4); + if (lookAt) + { + LookAt(new Vector3(player.transform.position.x, transform.position.y, player.transform.position.z)); + } } public override bool Collect(ref StripsVariableMapping.PackageMapping package) { package.SetMapping("Distance2Player", Vector3.Distance(player.transform.position, transform.position).ToString()); - package.SetMapping("IsPlayerVisible", true.ToString()); package.SetMapping("AIHealth", health.ToString()); + + Ray ray = new Ray(); + ray.origin = transform.position; + ray.direction = player.transform.position- transform.position; + RaycastHit visibleHit; + if(Physics.Raycast(ray, out visibleHit)) + { + //print("Detection:" + visibleHit.transform.name); + package.SetMapping("IsPlayerVisible", visibleHit.transform.parent.CompareTag("Player").ToString()); + } + + + + + Vector3 pistolForward = PlayerInteractionHandler.instance.Pistol.transform.up; + Vector3 pistolPosition = PlayerInteractionHandler.instance.Pistol.transform.position; + Ray r = new Ray(); + r.origin = pistolPosition; + r.direction = pistolForward; + RaycastHit hit; + + if (Physics.Raycast(r, out hit, 50)) + { + package.SetMapping("AimedAt", (hit.transform == this.gameObject.transform).ToString()); + } + return true; } } diff --git a/Assets/Scripts/Enemies/AI/AIV2/Strips/IStripsActionResolver.cs b/Assets/Scripts/Enemies/AI/AIV2/Strips/IStripsActionResolver.cs index e7034da..0fa6bb6 100644 --- a/Assets/Scripts/Enemies/AI/AIV2/Strips/IStripsActionResolver.cs +++ b/Assets/Scripts/Enemies/AI/AIV2/Strips/IStripsActionResolver.cs @@ -11,11 +11,13 @@ public interface IStripsActionResolver [System.Serializable] public abstract class AStripsActionResolver : MonoBehaviour { - public enum StripsActionResolverAction { MoveTo, Attack, Hide, Roar, LookAt, Idle } + public enum StripsActionResolverAction { MoveTo, Dodge, Attack, Hide, Roar, LookAt, Idle } public virtual void MoveTo(Vector3 position) { } public virtual void MoveTo() { } + public virtual void Dodge() { } + public virtual void Attack() { } public virtual void Hide() { } public virtual void Roar() { } diff --git a/Assets/Scripts/Enemies/AI/AIV2/Strips/StripsActionResolver.cs b/Assets/Scripts/Enemies/AI/AIV2/Strips/StripsActionResolver.cs index 672973d..1a16ae6 100644 --- a/Assets/Scripts/Enemies/AI/AIV2/Strips/StripsActionResolver.cs +++ b/Assets/Scripts/Enemies/AI/AIV2/Strips/StripsActionResolver.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using Unity.VisualScripting.YamlDotNet.Serialization.TypeInspectors; using UnityEngine; namespace STRIPS @@ -19,6 +20,7 @@ public class StripsActionResolver : MonoBehaviour private StripsVariableMapping.PackageMapping updatedStats; private void PerformAction(AStripsActionResolver.StripsActionResolverAction action) { + print("Performing Action:" + action); switch(action) { case AStripsActionResolver.StripsActionResolverAction.Attack: @@ -36,6 +38,9 @@ private void PerformAction(AStripsActionResolver.StripsActionResolverAction acti case AStripsActionResolver.StripsActionResolverAction.MoveTo: chosenResolver.MoveTo(); break; + case AStripsActionResolver.StripsActionResolverAction.Dodge: + chosenResolver.Dodge(); + break; default: chosenResolver.Idle(); break; @@ -61,6 +66,7 @@ public void Selector() foreach(AStripsActionResolver.StripsActionResolverAction action in functs) { PerformAction(action); + } } @@ -80,7 +86,7 @@ void Update() { //all good } - print("Current Action:" + activeGoal.name); + } diff --git a/Assets/Scripts/Enemies/AI/AIV2/Strips/StripsGoal.cs b/Assets/Scripts/Enemies/AI/AIV2/Strips/StripsGoal.cs index 2f507fb..18117bc 100644 --- a/Assets/Scripts/Enemies/AI/AIV2/Strips/StripsGoal.cs +++ b/Assets/Scripts/Enemies/AI/AIV2/Strips/StripsGoal.cs @@ -8,7 +8,10 @@ namespace STRIPS public class StripsGoal : ScriptableObject { public string goalName; - public StripsAction[] actions; + //public StripsAction[] actions; + public StripsActionMap[] actions; + + public Dictionary WeightMap = new Dictionary(); private List available; public List Available { get { return available; } } @@ -18,14 +21,20 @@ public void UpdateActionConditionals(StripsVariableMapping.PackageMapping update List available = new List (); for(int i =0; i < actions.Length; i++) { - if (actions[i].EvaluateConditionals(updatedMappings)) + if (actions[i].action.EvaluateConditionals(updatedMappings)) { - available.Add(actions[i]); + available.Add(actions[i].action); } } this.available=available; } + [System.Serializable] + public class StripsActionMap { + public StripsAction action; + public float weight; + } + } } diff --git a/Assets/Scripts/Player/PlayerInteractionHandler.cs b/Assets/Scripts/Player/PlayerInteractionHandler.cs index 608ac6c..2cbba19 100644 --- a/Assets/Scripts/Player/PlayerInteractionHandler.cs +++ b/Assets/Scripts/Player/PlayerInteractionHandler.cs @@ -18,6 +18,7 @@ public class PlayerInteractionHandler : MonoBehaviour [SerializeField] private bool useItemSelector = true; [SerializeField] private PistolComponent pistol; + public PistolComponent Pistol { get { return pistol; } } [SerializeField] private NoiseVisibilitySettingsManager noiseManager; diff --git a/Assets/Shaders/Dissolve2.shadergraph b/Assets/Shaders/Dissolve2.shadergraph index c33658d..0d03e37 100644 --- a/Assets/Shaders/Dissolve2.shadergraph +++ b/Assets/Shaders/Dissolve2.shadergraph @@ -35,6 +35,9 @@ }, { "m_Id": "20d3934cad634b40a7c6d9a1ef5b6b9f" + }, + { + "m_Id": "b3999385469e476791ebc291971a43cc" } ], "m_Keywords": [], @@ -149,6 +152,12 @@ }, { "m_Id": "8e852b7f2baa4862824c149e0534ae14" + }, + { + "m_Id": "87e327b8818a421ea5a247897db38334" + }, + { + "m_Id": "e7f196d083494b7cb4a0d238dce39592" } ], "m_GroupDatas": [], @@ -266,6 +275,48 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "87e327b8818a421ea5a247897db38334" + }, + "m_SlotId": 3 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "2fc2a993ceb3482f8a8fd50ad4a98c7b" + }, + "m_SlotId": 2 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "87e327b8818a421ea5a247897db38334" + }, + "m_SlotId": 3 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "a60436d8dbef49a0a2ae436e5eb36f2e" + }, + "m_SlotId": 2 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "87e327b8818a421ea5a247897db38334" + }, + "m_SlotId": 3 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "ce10eeebdbbb48d8a5b46bd75dade34a" + }, + "m_SlotId": 2 + } + }, { "m_OutputSlot": { "m_Node": { @@ -503,6 +554,20 @@ }, "m_SlotId": 0 } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "e7f196d083494b7cb4a0d238dce39592" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "87e327b8818a421ea5a247897db38334" + }, + "m_SlotId": 1 + } } ], "m_VertexContext": { @@ -912,6 +977,49 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", + "m_ObjectId": "2189f87417114bb08753f3981065388e", + "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.Vector2MaterialSlot", + "m_ObjectId": "272b0f74610e43bea6ee30e833fc72f7", + "m_Id": 2, + "m_DisplayName": "Offset", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Offset", + "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.Vector1MaterialSlot", @@ -1006,10 +1114,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -410.3999328613281, + "x": -882.4000244140625, "y": 199.99998474121095, - "width": 183.19996643066407, - "height": 247.9999542236328 + "width": 183.20001220703126, + "height": 248.80003356933595 } }, "m_Slots": [ @@ -1134,10 +1242,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -292.8000183105469, - "y": 669.5999755859375, - "width": 140.8000030517578, - "height": 33.60003662109375 + "x": -763.2000732421875, + "y": 660.800048828125, + "width": 140.79998779296876, + "height": 33.5999755859375 } }, "m_Slots": [ @@ -1235,10 +1343,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -959.2000732421875, - "y": 255.9999542236328, + "x": -1429.60009765625, + "y": 247.2000274658203, "width": 208.0, - "height": 301.59991455078127 + "height": 302.4000244140625 } }, "m_Slots": [ @@ -1366,6 +1474,9 @@ }, { "m_Id": "7d73b7705a6542ab92af353b92b5192e" + }, + { + "m_Id": "b3999385469e476791ebc291971a43cc" } ] } @@ -1566,10 +1677,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1279.2000732421875, - "y": 439.199951171875, - "width": 125.60009765625, - "height": 76.800048828125 + "x": -1749.60009765625, + "y": 430.4000549316406, + "width": 125.5999755859375, + "height": 76.80001831054688 } }, "m_Slots": [ @@ -2008,10 +2119,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1328.0279541015625, - "y": 390.8648681640625, - "width": 0.0, - "height": 0.0 + "x": -1798.400146484375, + "y": 382.40008544921877, + "width": 155.2000732421875, + "height": 33.599945068359378 } }, "m_Slots": [ @@ -2164,10 +2275,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -194.39996337890626, - "y": 268.0, - "width": 130.39999389648438, - "height": 117.5999755859375 + "x": -664.8001098632813, + "y": 259.20001220703127, + "width": 130.39996337890626, + "height": 118.4000244140625 } }, "m_Slots": [ @@ -2194,6 +2305,50 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.TilingAndOffsetNode", + "m_ObjectId": "87e327b8818a421ea5a247897db38334", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Tiling And Offset", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1917.599853515625, + "y": -515.2000122070313, + "width": 208.0, + "height": 325.60003662109377 + } + }, + "m_Slots": [ + { + "m_Id": "2189f87417114bb08753f3981065388e" + }, + { + "m_Id": "a146c1779e094dd58dc2d7cbe8defe12" + }, + { + "m_Id": "272b0f74610e43bea6ee30e833fc72f7" + }, + { + "m_Id": "ade4377a0dd74f39af91cfed874cf91b" + } + ], + "synonyms": [ + "pan", + "scale" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -2206,10 +2361,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -622.3999633789063, - "y": 199.99996948242188, - "width": 161.60006713867188, - "height": 33.59999084472656 + "x": -1092.800048828125, + "y": 191.20005798339845, + "width": 162.39984130859376, + "height": 33.599945068359378 } }, "m_Slots": [ @@ -2276,10 +2431,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1251.2000732421875, - "y": 83.99993133544922, - "width": 208.0001220703125, - "height": 302.4000244140625 + "x": -1853.60009765625, + "y": -77.59996795654297, + "width": 208.0, + "height": 302.39996337890627 } }, "m_Slots": [ @@ -2329,10 +2484,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -873.6000366210938, - "y": -101.60008239746094, - "width": 207.99993896484376, - "height": 301.5999755859375 + "x": -1344.0001220703125, + "y": -110.4000015258789, + "width": 208.0, + "height": 302.4000549316406 } }, "m_Slots": [ @@ -2422,10 +2577,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1582.400146484375, - "y": 4.799994945526123, + "x": -2256.000244140625, + "y": -391.20001220703127, "width": 208.0, - "height": 312.8000183105469 + "height": 313.60003662109377 } }, "m_Slots": [ @@ -2568,6 +2723,27 @@ "m_SerializedDescriptor": "SurfaceDescription.AlphaClipThreshold" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "a146c1779e094dd58dc2d7cbe8defe12", + "m_Id": 1, + "m_DisplayName": "Tiling", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Tiling", + "m_StageCapability": 3, + "m_Value": { + "x": 1.0, + "y": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", @@ -2661,10 +2837,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1129.5999755859375, - "y": -630.3999633789063, + "x": -1600.0001220703125, + "y": -639.199951171875, "width": 208.0, - "height": 432.0 + "height": 432.8000183105469 } }, "m_Slots": [ @@ -2717,10 +2893,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -701.6000366210938, - "y": 390.39996337890627, - "width": 158.39996337890626, - "height": 33.60003662109375 + "x": -1172.0001220703125, + "y": 381.60003662109377, + "width": 158.4000244140625, + "height": 33.599945068359378 } }, "m_Slots": [ @@ -2832,6 +3008,27 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "ade4377a0dd74f39af91cfed874cf91b", + "m_Id": 3, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -2868,10 +3065,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -892.423095703125, - "y": -214.7740020751953, - "width": 0.0, - "height": 0.0 + "x": -1363.2000732421875, + "y": -223.19998168945313, + "width": 132.0, + "height": 33.60002136230469 } }, "m_Slots": [ @@ -2916,6 +3113,33 @@ "m_Labels": [] } +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector2ShaderProperty", + "m_ObjectId": "b3999385469e476791ebc291971a43cc", + "m_Guid": { + "m_GuidSerialized": "f7ca747c-a967-4914-ab85-54920f4247b6" + }, + "m_Name": "Tiling", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Tiling", + "m_DefaultReferenceName": "_Tiling", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "x": 1.0, + "y": 1.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", @@ -3238,10 +3462,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1447.2000732421875, - "y": 499.1999816894531, - "width": 119.2000732421875, - "height": 33.600006103515628 + "x": -1917.60009765625, + "y": 490.4000244140625, + "width": 119.199951171875, + "height": 33.60009765625 } }, "m_Slots": [ @@ -3405,6 +3629,27 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "d8abfd0b0daf4e66b7d7b4363c933352", + "m_Id": 0, + "m_DisplayName": "Tiling", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "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.ColorRGBMaterialSlot", @@ -3471,10 +3716,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1549.969970703125, - "y": 162.13848876953126, - "width": 0.0, - "height": 0.0 + "x": -2152.000244140625, + "y": 0.800012469291687, + "width": 133.60009765625, + "height": 33.60002136230469 } }, "m_Slots": [ @@ -3506,10 +3751,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -337.9079895019531, - "y": -93.3969497680664, - "width": 0.0, - "height": 0.0 + "x": -808.0001220703125, + "y": -101.5999526977539, + "width": 208.0, + "height": 302.39996337890627 } }, "m_Slots": [ @@ -3548,10 +3793,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -730.4000854492188, - "y": -420.800048828125, - "width": 130.40008544921876, - "height": 33.5999755859375 + "x": -1172.0001220703125, + "y": -444.800048828125, + "width": 130.4000244140625, + "height": 33.600006103515628 } }, "m_Slots": [ @@ -3598,10 +3843,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -566.4000854492188, - "y": -537.5999755859375, - "width": 208.00003051757813, - "height": 301.6000061035156 + "x": -1036.8001708984375, + "y": -546.3999633789063, + "width": 208.0, + "height": 302.4000244140625 } }, "m_Slots": [ @@ -3640,9 +3885,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1409.5999755859375, - "y": -630.3999633789063, - "width": 149.5999755859375, + "x": -1792.8001708984375, + "y": -639.199951171875, + "width": 149.60009765625, "height": 33.5999755859375 } }, @@ -3688,10 +3933,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -293.06597900390627, - "y": 636.3870239257813, - "width": 0.0, - "height": 0.0 + "x": -763.2000732421875, + "y": 628.0000610351563, + "width": 115.99993896484375, + "height": 33.60009765625 } }, "m_Slots": [ @@ -3739,6 +3984,41 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "e7f196d083494b7cb4a0d238dce39592", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -2142.000244140625, + "y": -514.0557250976563, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "d8abfd0b0daf4e66b7d7b4363c933352" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "b3999385469e476791ebc291971a43cc" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot",