From 7a1e043f3b3a334edbc7f4eb6b78ced4523e82c5 Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 29 Nov 2019 10:09:33 +1100 Subject: [PATCH 1/2] Display clip names in AnimatorClipPlayable nodes --- Editor/Graph/Node.cs | 5 +++++ Editor/Graph/Renderer/DefaultGraphRenderer.cs | 2 +- Editor/PlayableNodes/AnimationClipPlayableNode.cs | 12 ++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Editor/Graph/Node.cs b/Editor/Graph/Node.cs index 53ade5d..ab8c4ec 100644 --- a/Editor/Graph/Node.cs +++ b/Editor/Graph/Node.cs @@ -57,6 +57,11 @@ public virtual string GetContentTypeShortName() return GetContentTypeName().Split('.').Last(); } + public virtual string GetLabel() + { + return null; + } + public override string ToString() { return "Node content: " + GetContentTypeName(); diff --git a/Editor/Graph/Renderer/DefaultGraphRenderer.cs b/Editor/Graph/Renderer/DefaultGraphRenderer.cs index 4951f2b..30c549f 100644 --- a/Editor/Graph/Renderer/DefaultGraphRenderer.cs +++ b/Editor/Graph/Renderer/DefaultGraphRenderer.cs @@ -459,7 +459,7 @@ private void DrawNode(Rect nodeRect, Node node, bool selected) { string nodeType = node.GetContentTypeName(); NodeTypeLegend nodeTypeLegend = m_LegendForType[nodeType]; - string formattedLabel = Regex.Replace(nodeTypeLegend.label, "((? Date: Fri, 29 Nov 2019 10:31:14 +1100 Subject: [PATCH 2/2] Show clip progress on AnimatorClipPlayable nodes --- Editor/Graph/Node.cs | 6 ++++++ Editor/Graph/Renderer/DefaultGraphRenderer.cs | 6 ++++++ .../AnimationClipPlayableNode.cs | 21 +++++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/Editor/Graph/Node.cs b/Editor/Graph/Node.cs index ab8c4ec..de02b88 100644 --- a/Editor/Graph/Node.cs +++ b/Editor/Graph/Node.cs @@ -62,6 +62,12 @@ public virtual string GetLabel() return null; } + public virtual bool TryGetProgress(out float progress) + { + progress = 0f; + return false; + } + public override string ToString() { return "Node content: " + GetContentTypeName(); diff --git a/Editor/Graph/Renderer/DefaultGraphRenderer.cs b/Editor/Graph/Renderer/DefaultGraphRenderer.cs index 30c549f..244f15b 100644 --- a/Editor/Graph/Renderer/DefaultGraphRenderer.cs +++ b/Editor/Graph/Renderer/DefaultGraphRenderer.cs @@ -462,6 +462,12 @@ private void DrawNode(Rect nodeRect, Node node, bool selected) string formattedLabel = node.GetLabel() ?? Regex.Replace(nodeTypeLegend.label, "((?