Merge pull request #83 from PaulNonatomic/develop

PaulNonatomic · web-flow · commit 1e87ead11ba4 · 2024-08-13T08:46:13.000+01:00
Develop
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## [0.6.4-beta] - Aug 12, 2024
+- Fix for rogue tilda
+- Added relay states
+
 ## [0.6.3-beta] - Aug 10, 2024
 - Added Counter State
 - Fix: When scenes with multiple StateMachineControllers load the selected controller and the first controller in the scene were both loaded into the same StateMachineEditor
diff --git a/Editor/Resources/RelayNodeView.uss b/Editor/Resources/RelayNodeView.uss
@@ -0,0 +1,70 @@
+.node #title {
+    flex-direction: row;
+    height: 19px;
+}
+
+.node Port {
+    height: 19px;
+    padding-top:0px;
+}
+
+.port.input {
+    background-color: #555555;
+}
+
+.port.output {
+    background-color: #777777;
+}
+
+.port.input #connector {
+    border-left-color: white;
+}
+
+.node #title-label {
+    font-size: 14px;
+    margin-left: 0px;
+    margin-right: 0px;
+    flex-grow: 1;
+    -unity-text-align: middle-center;
+    -unity-font-style: Bold;
+}
+
+.node #title-container {
+    margin-top: 0px;
+    margin-bottom: 0px;
+    flex-direction: row;
+}
+
+.node #title-button-container {
+    visibility: hidden;
+    width:0;
+    height:0;
+}
+
+.node #state-border {
+    position: absolute;
+    right: 0;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    border-color: green;
+    border-width: 2px;
+    border-radius: 8px;
+    opacity:0;
+    margin:1px;
+}
+
+Port {
+    height: 100%;
+    width: 25px;
+    min-width: 25px;
+    padding-top:8px;
+}
+
+Port Label {
+    display: none;
+}
+
+.node #contents {
+    display: none;
+}
diff --git a/Editor/Resources/RelayNodeView.uss.meta b/Editor/Resources/RelayNodeView.uss.meta
diff --git a/Editor/StateGraph/Factories/StateGraphNodeFactory.cs b/Editor/StateGraph/Factories/StateGraphNodeFactory.cs
@@ -18,6 +18,7 @@ public static class StateGraphNodeFactory
 			{typeof(JumpInState), typeof(JumpNodeView)},
 			{typeof(JumpOutState), typeof(JumpNodeView)},
 			{typeof(DelayState), typeof(DelayNodeView)},
+			{typeof(RelayState), typeof(RelayNodeView)},
 			{typeof(CounterState), typeof(CounterNodeView)},
 			{typeof(DelayUnscaledState), typeof(DelayNodeView)},
 			{typeof(SubStateMachineState), typeof(SubStateNodeView)},
diff --git a/Editor/StateGraph/Nodes/BaseStateNodeView.cs b/Editor/StateGraph/Nodes/BaseStateNodeView.cs
@@ -338,7 +338,7 @@ protected virtual void AddEditButton()
 			if(!NodeModel?.State) return;
 			
 			var stateNamespace = NodeModel.State.GetType().Namespace;
-			if (stateNamespace == "Nonatomic.VSM2.StateGraph.States") return;
+			if (stateNamespace == "Nonatomic.VSM2.StateGraph.States~") return;
 			
 			var editButton = new Button(HandleEditButton)
 			{
diff --git a/Editor/StateGraph/Nodes/CounterNodeView.cs b/Editor/StateGraph/Nodes/CounterNodeView.cs
@@ -20,7 +20,7 @@ public CounterNodeView(GraphView graphView,
 
 			_counterState = (BaseCounterState) nodeModel.State;
 			
-			AddStyle("CounterNodeView");
+			AddStyle(nameof(CounterNodeView));
 			AddTitleContainer();
 			ColorizeTitle();
 			RemoveTitleLabel();
diff --git a/Editor/StateGraph/Nodes/DelayNodeView.cs b/Editor/StateGraph/Nodes/DelayNodeView.cs
@@ -18,7 +18,7 @@ public DelayNodeView(GraphView graphView,
 							 : base(graphView, stateMachineModel, nodeModel)
 		{
 
-			AddStyle("DelayNodeView");
+			AddStyle(nameof(DelayNodeView));
 			AddTitleContainer();
 			ColorizeTitle();
 			RemoveTitleLabel();
diff --git a/Editor/StateGraph/Nodes/EntryNodeView.cs b/Editor/StateGraph/Nodes/EntryNodeView.cs
@@ -11,7 +11,7 @@ public EntryNodeView(GraphView graphView,
 							: base(graphView, stateMachineModel, nodeModel)
 		{
 			
-			AddStyle("EntryNodeView");
+			AddStyle(nameof(EntryNodeView));
 			AddTitleContainer();
 			ColorizeTitle();
 			AddTitleLabel();
diff --git a/Editor/StateGraph/Nodes/ExitNodeView.cs b/Editor/StateGraph/Nodes/ExitNodeView.cs
@@ -11,7 +11,7 @@ public ExitNodeView(GraphView graphView,
 							StateNodeModel nodeModel) 
 							: base(graphView, stateMachineModel, nodeModel)
 		{
-			AddStyle("ExitNodeView");
+			AddStyle(nameof(ExitNodeView));
 			AddTitleContainer();
 			ColorizeTitle();
 			AddTitleLabel();
diff --git a/Editor/StateGraph/Nodes/JumpNodeView.cs b/Editor/StateGraph/Nodes/JumpNodeView.cs
@@ -26,7 +26,7 @@ public JumpNodeView(GraphView graphView,
 		{
 			_jumpState = NodeModel.State as JumpState;
 
-			AddStyle("JumpNodeView");
+			AddStyle(nameof(JumpNodeView));
 			AddToClassList(NodeModel.State is JumpOutState ? "jump-out" : "jump-in");
 			AddBeacon(_jumpState);
 			AddTitleContainer();
diff --git a/Editor/StateGraph/Nodes/RelayNodeView.cs b/Editor/StateGraph/Nodes/RelayNodeView.cs
@@ -0,0 +1,28 @@
+﻿using Nonatomic.VSM2.StateGraph;
+using UnityEditor.Experimental.GraphView;
+
+namespace Nonatomic.VSM2.Editor.StateGraph.Nodes
+{
+	public class RelayNodeView : BaseStateNodeView
+	{
+		public RelayNodeView(GraphView graphView, 
+							 StateMachineModel stateMachineModel, 
+							 StateNodeModel nodeModel) 
+							: base(graphView, stateMachineModel, nodeModel)
+		{
+			AddStyle(nameof(RelayNodeView));
+			AddTitleContainer();
+			ColorizeTitle();
+			RemoveTitleLabel();
+			AddGlowBorder();
+			AddInputPorts(TitleContainer);
+			AddOutputPorts(TitleContainer);
+			UpdatePosition();
+		}
+		
+		public override void Update()
+		{
+			UpdateGlowBorder();
+		}
+	}
+}
diff --git a/Editor/StateGraph/Nodes/RelayNodeView.cs.meta b/Editor/StateGraph/Nodes/RelayNodeView.cs.meta
diff --git a/Editor/StateGraph/Nodes/StateNodeView.cs b/Editor/StateGraph/Nodes/StateNodeView.cs
@@ -23,7 +23,7 @@ public StateNodeView(GraphView graphView,
 			
 			var contents = this.Query<VisualElement>("contents").First();
 			
-			AddStyle("StateNodeView");
+			AddStyle(nameof(StateNodeView));
 			AddTitleContainer();
 			ColorizeTitle();
 			AddTitleLabel();
diff --git a/Editor/StateGraph/Nodes/StickyNoteNodeView.cs b/Editor/StateGraph/Nodes/StickyNoteNodeView.cs
@@ -13,7 +13,7 @@ public StickyNoteNodeView(GraphView graphView, StateMachineModel stateMachineMod
 		{
 			var contents = this.Query<VisualElement>("contents").First();
 			
-			AddStyle("StickyNoteNodeView");
+			AddStyle(nameof(StickyNoteNodeView));
 			AddTitleContainer();
 			ColorizeTitle();
 			AddTitleLabel("Note");
diff --git a/Editor/StateGraph/Nodes/SubStateNodeView.cs b/Editor/StateGraph/Nodes/SubStateNodeView.cs
@@ -19,7 +19,7 @@ public SubStateNodeView(GraphView graphView,
 								StateNodeModel nodeModel) 
 								: base(graphView, stateMachineModel, nodeModel)
 		{
-			AddStyle("SubStateNodeView");
+			AddStyle(nameof(SubStateNodeView));
 			AddTitleContainer();
 			ColorizeTitle();
 			AddTitleLabel();
diff --git a/Runtime/StateGraph/States.meta b/Runtime/StateGraph/States.meta
diff --git a/Runtime/StateGraph/States/CounterState.cs b/Runtime/StateGraph/States/CounterState.cs
@@ -5,7 +5,7 @@
 namespace Nonatomic.VSM2.StateGraph.States
 {
 	/**
-	 * Remember that States are derived from ScriptableObject so
+	 * Remember that States~ are derived from ScriptableObject so
 	 * it's important to flag that the Count value should not be
 	 * serialized, although we reset the value on awake any way.
 	 */
diff --git a/Runtime/StateGraph/States/RelayState.cs b/Runtime/StateGraph/States/RelayState.cs
@@ -0,0 +1,22 @@
+﻿using System;
+using Nonatomic.VSM2.NodeGraph;
+using Nonatomic.VSM2.StateGraph.Attributes;
+
+namespace Nonatomic.VSM2.StateGraph.States
+{
+	[NodeColor(NodeColor.Blue)]
+	public class RelayState : State
+	{
+		[Transition(frameDelay:0)] public event Action OnComplete;
+		
+		public override void OnEnterState()
+		{
+			OnComplete?.Invoke();
+		}
+
+		public override void OnExitState()
+		{
+			//...
+		}
+	}
+}
diff --git a/Runtime/StateGraph/States/RelayState.cs.meta b/Runtime/StateGraph/States/RelayState.cs.meta
diff --git a/Samples~/Animation/Content/StateMachines/AnimationState.asset b/Samples~/Animation/Content/StateMachines/AnimationState.asset
@@ -363,7 +363,7 @@ MonoBehaviour:
     OriginPort:
       Id: OnEntry
       Index: 0
-      FrameDelay: 1
+      FrameDelay: 0
       PortLabel: 
       PortColor: '#116f1c'
     DestinationPort:
@@ -377,7 +377,7 @@ MonoBehaviour:
     OriginPort:
       Id: OnExit
       Index: 0
-      FrameDelay: 1
+      FrameDelay: 0
       PortLabel: 
       PortColor: '#B06101'
     DestinationPort:
@@ -405,7 +405,7 @@ MonoBehaviour:
     OriginPort:
       Id: OnExit
       Index: 0
-      FrameDelay: 1
+      FrameDelay: 0
       PortLabel: 
       PortColor: '#B06101'
     DestinationPort:
@@ -475,7 +475,7 @@ MonoBehaviour:
     OriginPort:
       Id: OnExit
       Index: 0
-      FrameDelay: 1
+      FrameDelay: 0
       PortLabel: 
       PortColor: '#B06101'
     DestinationPort:
@@ -489,7 +489,7 @@ MonoBehaviour:
     OriginPort:
       Id: OnExit
       Index: 0
-      FrameDelay: 1
+      FrameDelay: 0
       PortLabel: 
       PortColor: '#B06101'
     DestinationPort:
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 ﻿{
   "name": "com.nonatomic.visualstatemachinev2",
-  "version": "0.6.3-beta",
+  "version": "0.6.4-beta",
   "displayName": "Visual State Machine V2",
   "description": "Visual State Machine V2",
   "unity": "2022.3",

Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@ protected virtual void AddEditButton()`
`338`	`338`	`if(!NodeModel?.State) return;`
`339`	`339`
`340`	`340`	`var stateNamespace = NodeModel.State.GetType().Namespace;`
`341`		`- if (stateNamespace == "Nonatomic.VSM2.StateGraph.States") return;`
	`341`	`+ if (stateNamespace == "Nonatomic.VSM2.StateGraph.States~") return;`
`342`	`342`
`343`	`343`	`var editButton = new Button(HandleEditButton)`
`344`	`344`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public DelayNodeView(GraphView graphView,`
`18`	`18`	`: base(graphView, stateMachineModel, nodeModel)`
`19`	`19`	`{`
`20`	`20`
`21`		`- AddStyle("DelayNodeView");`
	`21`	`+ AddStyle(nameof(DelayNodeView));`
`22`	`22`	`AddTitleContainer();`
`23`	`23`	`ColorizeTitle();`
`24`	`24`	`RemoveTitleLabel();`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public EntryNodeView(GraphView graphView,`
`11`	`11`	`: base(graphView, stateMachineModel, nodeModel)`
`12`	`12`	`{`
`13`	`13`
`14`		`- AddStyle("EntryNodeView");`
	`14`	`+ AddStyle(nameof(EntryNodeView));`
`15`	`15`	`AddTitleContainer();`
`16`	`16`	`ColorizeTitle();`
`17`	`17`	`AddTitleLabel();`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public ExitNodeView(GraphView graphView,`
`11`	`11`	`StateNodeModel nodeModel)`
`12`	`12`	`: base(graphView, stateMachineModel, nodeModel)`
`13`	`13`	`{`
`14`		`- AddStyle("ExitNodeView");`
	`14`	`+ AddStyle(nameof(ExitNodeView));`
`15`	`15`	`AddTitleContainer();`
`16`	`16`	`ColorizeTitle();`
`17`	`17`	`AddTitleLabel();`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public JumpNodeView(GraphView graphView,`
`26`	`26`	`{`
`27`	`27`	`_jumpState = NodeModel.State as JumpState;`
`28`	`28`
`29`		`- AddStyle("JumpNodeView");`
	`29`	`+ AddStyle(nameof(JumpNodeView));`
`30`	`30`	`AddToClassList(NodeModel.State is JumpOutState ? "jump-out" : "jump-in");`
`31`	`31`	`AddBeacon(_jumpState);`
`32`	`32`	`AddTitleContainer();`