doloro/av3-animation-as-crab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Replace single-letter template variable T with TNode

Browse Source
This commit is contained in:
Haï~
2022-05-10 20:06:46 +02:00
parent 838ed8cd38
commit 261ea030c4
1 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Framework/Editor/V0/AacAnimatorNode.cs
+16 -15
View File
@@ -1,5 +1,6 @@
using UnityEngine; using UnityEngine;
// ReSharper disable once CheckNamespace
namespace AnimatorAsCode.V0 namespace AnimatorAsCode.V0
{ {
public abstract class AacAnimatorNode public abstract class AacAnimatorNode
@@ -8,7 +9,7 @@ namespace AnimatorAsCode.V0
protected internal abstract void SetPosition(Vector3 position); protected internal abstract void SetPosition(Vector3 position);
} }
public abstract class AacAnimatorNode<T> : AacAnimatorNode where T: AacAnimatorNode<T> public abstract class AacAnimatorNode<TNode> : AacAnimatorNode where TNode : AacAnimatorNode<TNode>
{ {
protected readonly AacFlStateMachine ParentMachine; protected readonly AacFlStateMachine ParentMachine;
protected readonly IAacDefaultsProvider DefaultsProvider; protected readonly IAacDefaultsProvider DefaultsProvider;
@@ -19,19 +20,19 @@ namespace AnimatorAsCode.V0
DefaultsProvider = defaultsProvider; DefaultsProvider = defaultsProvider;
} }
public T LeftOf(T otherNode) => MoveNextTo(otherNode, -1, 0); public TNode LeftOf(TNode otherNode) => MoveNextTo(otherNode, -1, 0);
public T RightOf(T otherNode) => MoveNextTo(otherNode, 1, 0); public TNode RightOf(TNode otherNode) => MoveNextTo(otherNode, 1, 0);
public T Over(T otherNode) => MoveNextTo(otherNode, 0, -1); public TNode Over(TNode otherNode) => MoveNextTo(otherNode, 0, -1);
public T Under(T otherNode) => MoveNextTo(otherNode, 0, 1); public TNode Under(TNode otherNode) => MoveNextTo(otherNode, 0, 1);
public T LeftOf() => MoveNextTo(null, -1, 0); public TNode LeftOf() => MoveNextTo(null, -1, 0);
public T RightOf() => MoveNextTo(null, 1, 0); public TNode RightOf() => MoveNextTo(null, 1, 0);
public T Over() => MoveNextTo(null, 0, -1); public TNode Over() => MoveNextTo(null, 0, -1);
public T Under() => MoveNextTo(null, 0, 1); public TNode Under() => MoveNextTo(null, 0, 1);
public T Shift(T otherState, int shiftX, int shiftY) => MoveNextTo(otherState, shiftX, shiftY); public TNode Shift(TNode otherState, int shiftX, int shiftY) => MoveNextTo(otherState, shiftX, shiftY);
private T MoveNextTo(T otherStateOrSecondToLastWhenNull, int x, int y) private TNode MoveNextTo(TNode otherStateOrSecondToLastWhenNull, int x, int y)
{ {
if (otherStateOrSecondToLastWhenNull == null) if (otherStateOrSecondToLastWhenNull == null)
{ {
@@ -39,18 +40,18 @@ namespace AnimatorAsCode.V0
var other = siblings[siblings.Count - 2]; var other = siblings[siblings.Count - 2];
Shift(other.GetPosition(), x, y); Shift(other.GetPosition(), x, y);
return (T) this; return (TNode) this;
} }
Shift(otherStateOrSecondToLastWhenNull.GetPosition(), x, y); Shift(otherStateOrSecondToLastWhenNull.GetPosition(), x, y);
return (T) this; return (TNode) this;
} }
public T Shift(Vector3 otherPosition, int shiftX, int shiftY) public TNode Shift(Vector3 otherPosition, int shiftX, int shiftY)
{ {
SetPosition(otherPosition + new Vector3(shiftX * DefaultsProvider.Grid().x, shiftY * DefaultsProvider.Grid().y, 0)); SetPosition(otherPosition + new Vector3(shiftX * DefaultsProvider.Grid().x, shiftY * DefaultsProvider.Grid().y, 0));
return (T) this; return (TNode) this;
} }
} }
} }