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

format & refactor

Browse Source
This commit is contained in:
galister
2022-05-10 20:03:40 +02:00
committed by Haï~
parent e14e2850a5
commit 5a7ae074cd
2 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Framework/Editor/V0/AacAnimatorNode.cs
+1 -3
View File
@@ -1,6 +1,4 @@
using UnityEngine; using UnityEngine;
using UnityEditor.Animations;
using System.Linq;
namespace AnimatorAsCode.V0 namespace AnimatorAsCode.V0
{ {
@@ -55,4 +53,4 @@ namespace AnimatorAsCode.V0
return (T) this; return (T) this;
} }
} }
} }
Framework/Editor/V0/AacFlStates.cs
+18 -20
View File
@@ -1,10 +1,8 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using JetBrains.Annotations;
using UnityEditor.Animations; using UnityEditor.Animations;
using UnityEngine; using UnityEngine;
using UnityEngine.UIElements;
using VRC.SDK3.Avatars.Components; using VRC.SDK3.Avatars.Components;
using VRC.SDKBase; using VRC.SDKBase;
@@ -743,7 +741,7 @@ namespace AnimatorAsCode.V0
{ {
private readonly AnimatorStateTransition _transition; private readonly AnimatorStateTransition _transition;
public AacFlTransition(AnimatorStateTransition transition, AnimatorStateMachine machine, AacFlTransitionEndpoint sourceNullableIfAny, AacFlTransitionEndpoint destinationNullableIfExits) : base(transition, machine, sourceNullableIfAny, destinationNullableIfExits) public AacFlTransition(AnimatorStateTransition transition, AnimatorStateMachine machine, AacTransitionEndpoint sourceNullableIfAny, AacTransitionEndpoint destinationNullableIfExits) : base(transition, machine, sourceNullableIfAny, destinationNullableIfExits)
{ {
_transition = transition; _transition = transition;
} }
@@ -817,7 +815,7 @@ namespace AnimatorAsCode.V0
public class AacFlEntryTransition : AacFlNewTransitionContinuation public class AacFlEntryTransition : AacFlNewTransitionContinuation
{ {
public AacFlEntryTransition(AnimatorTransition transition, AnimatorStateMachine machine, AnimatorState sourceNullableIfAny, AacFlTransitionEndpoint destinationNullableIfExits) : base(transition, machine, sourceNullableIfAny, destinationNullableIfExits) public AacFlEntryTransition(AnimatorTransition transition, AnimatorStateMachine machine, AnimatorState sourceNullableIfAny, AacTransitionEndpoint destinationNullableIfExits) : base(transition, machine, sourceNullableIfAny, destinationNullableIfExits)
{ {
} }
} }
@@ -852,10 +850,10 @@ namespace AnimatorAsCode.V0
{ {
public readonly AnimatorTransitionBase Transition; public readonly AnimatorTransitionBase Transition;
private readonly AnimatorStateMachine _machine; private readonly AnimatorStateMachine _machine;
private readonly AacFlTransitionEndpoint _sourceNullableIfAny; private readonly AacTransitionEndpoint _sourceNullableIfAny;
private readonly AacFlTransitionEndpoint _destinationNullableIfExits; private readonly AacTransitionEndpoint _destinationNullableIfExits;
public AacFlNewTransitionContinuation(AnimatorTransitionBase transition, AnimatorStateMachine machine, AacFlTransitionEndpoint sourceNullableIfAny, AacFlTransitionEndpoint destinationNullableIfExits) public AacFlNewTransitionContinuation(AnimatorTransitionBase transition, AnimatorStateMachine machine, AacTransitionEndpoint sourceNullableIfAny, AacTransitionEndpoint destinationNullableIfExits)
{ {
Transition = transition; Transition = transition;
_machine = machine; _machine = machine;
@@ -936,7 +934,7 @@ namespace AnimatorAsCode.V0
public class AacFlTransitionContinuation : AacFlTransitionContinuationAbstractWithOr public class AacFlTransitionContinuation : AacFlTransitionContinuationAbstractWithOr
{ {
public AacFlTransitionContinuation(AnimatorTransitionBase transition, AnimatorStateMachine machine, AacFlTransitionEndpoint sourceNullableIfAny, AacFlTransitionEndpoint destinationNullableIfExits) : base(transition, machine, sourceNullableIfAny, destinationNullableIfExits) public AacFlTransitionContinuation(AnimatorTransitionBase transition, AnimatorStateMachine machine, AacTransitionEndpoint sourceNullableIfAny, AacTransitionEndpoint destinationNullableIfExits) : base(transition, machine, sourceNullableIfAny, destinationNullableIfExits)
{ {
} }
@@ -976,7 +974,7 @@ namespace AnimatorAsCode.V0
{ {
private readonly List<AacFlTransitionContinuation> _pendingContinuations; private readonly List<AacFlTransitionContinuation> _pendingContinuations;
public AacFlMultiTransitionContinuation(AnimatorTransitionBase transition, AnimatorStateMachine machine, AacFlTransitionEndpoint sourceNullableIfAny, AacFlTransitionEndpoint destinationNullableIfExits, List<AacFlTransitionContinuation> pendingContinuations) : base(transition, machine, sourceNullableIfAny, destinationNullableIfExits) public AacFlMultiTransitionContinuation(AnimatorTransitionBase transition, AnimatorStateMachine machine, AacTransitionEndpoint sourceNullableIfAny, AacTransitionEndpoint destinationNullableIfExits, List<AacFlTransitionContinuation> pendingContinuations) : base(transition, machine, sourceNullableIfAny, destinationNullableIfExits)
{ {
_pendingContinuations = pendingContinuations; _pendingContinuations = pendingContinuations;
} }
@@ -1023,7 +1021,7 @@ namespace AnimatorAsCode.V0
public class AacFlTransitionContinuationOnlyOr : AacFlTransitionContinuationAbstractWithOr public class AacFlTransitionContinuationOnlyOr : AacFlTransitionContinuationAbstractWithOr
{ {
public AacFlTransitionContinuationOnlyOr(AnimatorTransitionBase transition, AnimatorStateMachine machine, AacFlTransitionEndpoint sourceNullableIfAny, AacFlTransitionEndpoint destinationNullableIfExits) : base(transition, machine, sourceNullableIfAny, destinationNullableIfExits) public AacFlTransitionContinuationOnlyOr(AnimatorTransitionBase transition, AnimatorStateMachine machine, AacTransitionEndpoint sourceNullableIfAny, AacTransitionEndpoint destinationNullableIfExits) : base(transition, machine, sourceNullableIfAny, destinationNullableIfExits)
{ {
} }
} }
@@ -1032,10 +1030,10 @@ namespace AnimatorAsCode.V0
{ {
protected readonly AnimatorTransitionBase Transition; protected readonly AnimatorTransitionBase Transition;
private readonly AnimatorStateMachine _machine; private readonly AnimatorStateMachine _machine;
private readonly AacFlTransitionEndpoint _sourceNullableIfAny; private readonly AacTransitionEndpoint _sourceNullableIfAny;
private readonly AacFlTransitionEndpoint _destinationNullableIfExits; private readonly AacTransitionEndpoint _destinationNullableIfExits;
public AacFlTransitionContinuationAbstractWithOr(AnimatorTransitionBase transition, AnimatorStateMachine machine, AacFlTransitionEndpoint sourceNullableIfAny, AacFlTransitionEndpoint destinationNullableIfExits) public AacFlTransitionContinuationAbstractWithOr(AnimatorTransitionBase transition, AnimatorStateMachine machine, AacTransitionEndpoint sourceNullableIfAny, AacTransitionEndpoint destinationNullableIfExits)
{ {
Transition = transition; Transition = transition;
_machine = machine; _machine = machine;
@@ -1171,29 +1169,29 @@ namespace AnimatorAsCode.V0
} }
} }
public class AacFlTransitionEndpoint public class AacTransitionEndpoint
{ {
private readonly AnimatorState _state; private readonly AnimatorState _state;
private readonly AnimatorStateMachine _stateMachine; private readonly AnimatorStateMachine _stateMachine;
public AacFlTransitionEndpoint([NotNull] AnimatorState state) public AacTransitionEndpoint(AnimatorState state)
{ {
_state = state; _state = state;
} }
public AacFlTransitionEndpoint([NotNull] AnimatorStateMachine stateMachine) public AacTransitionEndpoint(AnimatorStateMachine stateMachine)
{ {
_stateMachine = stateMachine; _stateMachine = stateMachine;
} }
public static implicit operator AacFlTransitionEndpoint([NotNull] AnimatorState state) public static implicit operator AacTransitionEndpoint(AnimatorState state)
{ {
return new AacFlTransitionEndpoint(state); return new AacTransitionEndpoint(state);
} }
public static implicit operator AacFlTransitionEndpoint([NotNull] AnimatorStateMachine stateMachine) public static implicit operator AacTransitionEndpoint(AnimatorStateMachine stateMachine)
{ {
return new AacFlTransitionEndpoint(stateMachine); return new AacTransitionEndpoint(stateMachine);
} }
public bool TryGetState(out AnimatorState state) public bool TryGetState(out AnimatorState state)