Merge pull request #87 from bazyleu/feature/autoresolve-context

Rewrok StateMachine running mechanism

Author: bazyleu

Assets/Benchmarks/UniStateFixtures/UniBenchmarkTestBase.cs

@@ -15,10 +15,11 @@ protected async UniTask Run(int stateCount, bool withoutHistory)
 
             benchmarkHelper.SetStatesCountTarget(stateCount);
 
-            IExecutableStateMachine stateMachine =
-                withoutHistory
-                    ? StateMachineHelper.CreateStateMachine<StateMachineWithoutHistory>(resolver)
-                    : StateMachineHelper.CreateStateMachine<StateMachine>(resolver);
+            var stateMachine = withoutHistory
+                ? resolver.Resolve<StateMachineWithoutHistory>()
+                : resolver.Resolve<StateMachine>();
+
+            stateMachine.SetResolver(resolver);
 
             await stateMachine.Execute<FooState>(CancellationToken.None);
         }

Assets/Examples/Infrastructure/DiceEntryPoint.cs

@@ -9,18 +9,16 @@ namespace Examples.Infrastructure
 {
     public class DiceEntryPoint : IStartable
     {
-        private readonly IObjectResolver _objectResolver;
+        private readonly IStateMachine _stateMachine;
 
-        public DiceEntryPoint(IObjectResolver objectResolver)
+        public DiceEntryPoint(IStateMachine stateMachine)
         {
-            _objectResolver = objectResolver;
+            _stateMachine = stateMachine;
         }
 
         public void Start()
         {
-            var stateMachine =  StateMachineHelper.CreateStateMachine<StateMachine>(_objectResolver.ToTypeResolver());
-
-            stateMachine.Execute<StartGameState>(CancellationToken.None).Forget();
+            _stateMachine.Execute<StartGameState>(CancellationToken.None).Forget();
         }
     }
 }

Assets/Examples/Infrastructure/DiceScope.cs

@@ -11,7 +11,7 @@ protected override void Configure(IContainerBuilder builder)
         {
             builder.RegisterEntryPoint<DiceEntryPoint>();
 
-            builder.RegisterStateMachine<StateMachine>();
+            builder.RegisterStateMachine<IStateMachine, StateMachine>();
 
             builder.RegisterState<StartGameState>();
             builder.RegisterState<RollDiceState>();

Assets/UniState/Runtime/Core/State/CompositeStateBase.cs

@@ -30,12 +30,6 @@ public override void SetPayload(TPayload payload)
             _subStatesContainer.SetPayload(payload);
         }
 
-        public override void SetStateMachineFactory(IStateMachineFactory stateMachineFactory)
-        {
-            base.SetStateMachineFactory(stateMachineFactory);
-            _subStatesContainer.SetStateMachineFactory(stateMachineFactory);
-        }
-
         public override void SetTransitionFacade(IStateTransitionFacade transitionFacade)
         {
             base.SetTransitionFacade(transitionFacade);

…Interfaces/IStateMachineFactorySetter.cs …Interfaces/ISetTransitionFacadeSetter.csAssets/UniState/Runtime/Core/State/Interfaces/IStateMachineFactorySetter.cs renamed to Assets/UniState/Runtime/Core/State/Interfaces/ISetTransitionFacadeSetter.cs Assets/UniState/Runtime/Core/State/Interfaces/IStateMachineFactorySetter.cs renamed to Assets/UniState/Runtime/Core/State/Interfaces/ISetTransitionFacadeSetter.cs

@@ -1,6 +1,6 @@
 namespace UniState
 {
-    public interface IStateMachineFactorySetter
+    public interface ISetTransitionFacadeSetter
     {
         void SetTransitionFacade(IStateTransitionFacade transitionFacade);
     }

…faces/IStateMachineFactorySetter.cs.meta …faces/ISetTransitionFacadeSetter.cs.metaAssets/UniState/Runtime/Core/State/Interfaces/IStateMachineFactorySetter.cs.meta renamed to Assets/UniState/Runtime/Core/State/Interfaces/ISetTransitionFacadeSetter.cs.meta Assets/UniState/Runtime/Core/State/Interfaces/IStateMachineFactorySetter.cs.meta renamed to Assets/UniState/Runtime/Core/State/Interfaces/ISetTransitionFacadeSetter.cs.meta

@@ -1,7 +1,7 @@
 namespace UniState
 {
-    public interface ISetupable<TPayload> : IPayloadSetter<TPayload>, ITransitionFacadeSetter,
-        IStateMachineFactorySetter
+    public interface ISetupable<TPayload> : IPayloadSetter<TPayload>,
+        ISetTransitionFacadeSetter
     {
     }
 }

Assets/UniState/Runtime/Core/State/Interfaces/ISetupable.cs

@@ -16,7 +16,6 @@ public abstract class StateBase<T> : IState<T>
         protected T Payload { get; private set; }
 
         protected IStateTransitionFacade Transition { get; private set; }
-        protected IStateMachineFactory StateMachineFactory { get; private set; }
         protected List<IDisposable> Disposables => _disposables ??= new(4);
 
         public abstract UniTask<StateTransitionInfo> Execute(CancellationToken token);
@@ -38,9 +37,6 @@ public virtual void SetPayload(T payload)
 
         public virtual void SetTransitionFacade(IStateTransitionFacade transitionFacade) => Transition = transitionFacade;
 
-        public virtual void SetStateMachineFactory(IStateMachineFactory stateMachineFactory) =>
-            StateMachineFactory = stateMachineFactory;
-
         public virtual void Dispose()
         {
             _disposables.Dispose();