GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Add SourceState and DestinationState modes to State Machine interruption modes in Anim Graph

Browse Source 
#1735
This commit is contained in:
Wojtek Figat
2024-01-07 18:34:15 +01:00
parent af0439f3ce
commit 8c2a156e1f
5 changed files with 153 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Editor/Surface/Archetypes/Animation.StateMachine.cs
View File

@@ -1583,14 +1583,24 @@ namespace FlaxEditor.Surface.Archetypes
None = 0,
/// <summary>
/// Transition rule will be rechecked during active transition with option to interrupt transition.
/// Transition rule will be rechecked during active transition with option to interrupt transition (to go back to the source state).
/// </summary>
RuleRechecking = 1,
/// <summary>
/// Interrupted transition is immediately stopped without blending out.
/// Interrupted transition is immediately stopped without blending out (back to the source/destination state).
/// </summary>
Instant = 2,
/// <summary>
/// Enables checking other transitions in the source state that might interrupt this one.
/// </summary>
SourceState = 4,
/// <summary>
/// Enables checking transitions in the destination state that might interrupt this one.
/// </summary>
DestinationState = 8,
}
/// <summary>
@@ -1613,6 +1623,8 @@ namespace FlaxEditor.Surface.Archetypes
UseDefaultRule = 4,
InterruptionRuleRechecking = 8,
InterruptionInstant = 16,
InterruptionSourceState = 32,
InterruptionDestinationState = 64,
}
/// <summary>
@@ -1773,7 +1785,7 @@ namespace FlaxEditor.Surface.Archetypes
}
/// <summary>
/// Transition interruption options.
/// Transition interruption options (flags, can select multiple values).
/// </summary>
[EditorOrder(70), DefaultValue(InterruptionFlags.None)]
public InterruptionFlags Interruption
@@ -1785,12 +1797,18 @@ namespace FlaxEditor.Surface.Archetypes
flags |= InterruptionFlags.RuleRechecking;
if (_data.HasFlag(Data.FlagTypes.InterruptionInstant))
flags |= InterruptionFlags.Instant;
if (_data.HasFlag(Data.FlagTypes.InterruptionSourceState))
flags |= InterruptionFlags.SourceState;
if (_data.HasFlag(Data.FlagTypes.InterruptionDestinationState))
flags |= InterruptionFlags.DestinationState;
return flags;
}
set
{
_data.SetFlag(Data.FlagTypes.InterruptionRuleRechecking, value.HasFlag(InterruptionFlags.RuleRechecking));
_data.SetFlag(Data.FlagTypes.InterruptionInstant, value.HasFlag(InterruptionFlags.Instant));
_data.SetFlag(Data.FlagTypes.InterruptionSourceState, value.HasFlag(InterruptionFlags.SourceState));
_data.SetFlag(Data.FlagTypes.InterruptionDestinationState, value.HasFlag(InterruptionFlags.DestinationState));
SourceState.SaveTransitions(true);
}
}

2
Source/Editor/Surface/Undo/ConnectBoxesAction.cs
View File

@@ -24,6 +24,8 @@ namespace FlaxEditor.Surface.Undo
public ConnectBoxesAction(InputBox iB, OutputBox oB, bool connect)
{
if (iB == null || oB == null || iB.ParentNode == null || oB.ParentNode == null)
throw new System.ArgumentNullException();
_surface = iB.Surface;
_context = new ContextHandle(iB.ParentNode.Context);
_connect = connect;