From a1e5a43491b36b5e0394deec07a6c91df8bf4024 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ha=C3=AF=7E?= Date: Sat, 9 Sep 2023 21:17:35 +0200 Subject: [PATCH] (BREAKING) Replace structs with classes --- Framework/Editor/V1/Aac.cs | 2 +- Framework/Editor/V1/AacAnimatorNode.cs | 5 ----- Framework/Editor/V1/AacFlAnimations.cs | 4 ++-- Framework/Editor/V1/AacFlStates.cs | 6 ------ 4 files changed, 3 insertions(+), 14 deletions(-) diff --git a/Framework/Editor/V1/Aac.cs b/Framework/Editor/V1/Aac.cs index eefa892..308546c 100644 --- a/Framework/Editor/V1/Aac.cs +++ b/Framework/Editor/V1/Aac.cs @@ -50,7 +50,7 @@ namespace AnimatorAsCode.V1 } } - public struct AacFlLayer + public class AacFlLayer { private readonly AnimatorController _animatorController; private readonly AacConfiguration _configuration; diff --git a/Framework/Editor/V1/AacAnimatorNode.cs b/Framework/Editor/V1/AacAnimatorNode.cs index a03d82f..b85de07 100644 --- a/Framework/Editor/V1/AacAnimatorNode.cs +++ b/Framework/Editor/V1/AacAnimatorNode.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using UnityEngine; // ReSharper disable once CheckNamespace @@ -16,9 +14,6 @@ namespace AnimatorAsCode.V1 protected readonly AacFlStateMachine ParentMachine; protected readonly IAacDefaultsProvider DefaultsProvider; - // TODO: What is this for??? - protected Dictionary behaviorCache = new Dictionary(); - protected AacAnimatorNode(AacFlStateMachine parentMachine, IAacDefaultsProvider defaultsProvider) { ParentMachine = parentMachine; diff --git a/Framework/Editor/V1/AacFlAnimations.cs b/Framework/Editor/V1/AacFlAnimations.cs index 4f4647a..a17a17b 100644 --- a/Framework/Editor/V1/AacFlAnimations.cs +++ b/Framework/Editor/V1/AacFlAnimations.cs @@ -7,7 +7,7 @@ using UnityEngine; // ReSharper disable once CheckNamespace namespace AnimatorAsCode.V1 { - public readonly struct AacFlClip + public class AacFlClip { private readonly AacConfiguration _component; public AnimationClip Clip { get; } @@ -146,7 +146,7 @@ namespace AnimatorAsCode.V1 } } - public readonly struct AacFlEditClip + public class AacFlEditClip { private readonly AacConfiguration _component; public AnimationClip Clip { get; } diff --git a/Framework/Editor/V1/AacFlStates.cs b/Framework/Editor/V1/AacFlStates.cs index 5ae454a..26bda5c 100644 --- a/Framework/Editor/V1/AacFlStates.cs +++ b/Framework/Editor/V1/AacFlStates.cs @@ -308,9 +308,6 @@ namespace AnimatorAsCode.V1 public override TBehaviour EnsureBehaviour() { - if (behaviorCache.TryGetValue(typeof(TBehaviour), out var existingBehavior)) - return (TBehaviour)existingBehavior; - foreach (var behaviour in Machine.behaviours) if (behaviour is TBehaviour myBehaviour) return myBehaviour; @@ -462,9 +459,6 @@ namespace AnimatorAsCode.V1 public override TBehaviour EnsureBehaviour() { - if (behaviorCache.TryGetValue(typeof(TBehaviour), out var existingBehavior)) - return (TBehaviour)existingBehavior; - foreach (var behaviour in State.behaviours) if (behaviour is TBehaviour myBehaviour) return myBehaviour;