UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1929 from vhristov/timeline_dont_pause_with_director

Browse Source 
[unity] Add option to not pause spine with timeline
This commit is contained in:
Harald Csaszar 2021-07-22 16:57:47 +02:00 committed by GitHub
commit 78c8c54ab7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineAnimationStateDrawer.cs
View File

@ -50,6 +50,7 @@ public class SpineAnimationStateDrawer : PropertyDrawer {
SerializedProperty useBlendDurationProp = property.FindPropertyRelative("useBlendDuration"); SerializedProperty useBlendDurationProp = property.FindPropertyRelative("useBlendDuration");
SerializedProperty mixDurationProp = property.FindPropertyRelative("mixDuration"); SerializedProperty mixDurationProp = property.FindPropertyRelative("mixDuration");
SerializedProperty holdPreviousProp = property.FindPropertyRelative("holdPrevious"); SerializedProperty holdPreviousProp = property.FindPropertyRelative("holdPrevious");
SerializedProperty dontPauseWithDirectorProp = property.FindPropertyRelative("dontPauseWithDirector");
SerializedProperty eventProp = property.FindPropertyRelative("eventThreshold"); SerializedProperty eventProp = property.FindPropertyRelative("eventThreshold");
SerializedProperty attachmentProp = property.FindPropertyRelative("attachmentThreshold"); SerializedProperty attachmentProp = property.FindPropertyRelative("attachmentThreshold");
SerializedProperty drawOrderProp = property.FindPropertyRelative("drawOrderThreshold"); SerializedProperty drawOrderProp = property.FindPropertyRelative("drawOrderThreshold");
@ -91,6 +92,9 @@ public class SpineAnimationStateDrawer : PropertyDrawer {
singleFieldRect.y += lineHeightWithSpacing; singleFieldRect.y += lineHeightWithSpacing;
EditorGUI.PropertyField(singleFieldRect, holdPreviousProp); EditorGUI.PropertyField(singleFieldRect, holdPreviousProp);
singleFieldRect.y += lineHeightWithSpacing;
EditorGUI.PropertyField(singleFieldRect, dontPauseWithDirectorProp);
singleFieldRect.y += lineHeightWithSpacing; singleFieldRect.y += lineHeightWithSpacing;
EditorGUI.PropertyField(singleFieldRect, eventProp); EditorGUI.PropertyField(singleFieldRect, eventProp);

1
spine-unity/Modules/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateBehaviour.cs
View File

@ -53,6 +53,7 @@ namespace Spine.Unity.Playables {
#pragma warning restore 414 #pragma warning restore 414
public float mixDuration = 0.1f; public float mixDuration = 0.1f;
public bool holdPrevious = false; public bool holdPrevious = false;
public bool dontPauseWithDirector = false;
[Range(0, 1f)] [Range(0, 1f)]
public float attachmentThreshold = 0.5f; public float attachmentThreshold = 0.5f;

11
spine-unity/Modules/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateMixerBehaviour.cs
View File

@ -41,14 +41,17 @@ namespace Spine.Unity.Playables {
public int trackIndex; public int trackIndex;
IAnimationStateComponent animationStateComponent; IAnimationStateComponent animationStateComponent;
bool dontPauseWithDirector = true;
bool isPaused = false; bool isPaused = false;
TrackEntry pausedTrackEntry; TrackEntry pausedTrackEntry;
float previousTimeScale = 1; float previousTimeScale = 1;
public override void OnBehaviourPause (Playable playable, FrameData info) { public override void OnBehaviourPause (Playable playable, FrameData info) {
if (!isPaused) if (!dontPauseWithDirector) {
HandlePause(playable); if (!isPaused)
isPaused = true; HandlePause(playable);
isPaused = true;
}
} }
public override void OnBehaviourPlay (Playable playable, FrameData info) { public override void OnBehaviourPlay (Playable playable, FrameData info) {
@ -119,6 +122,8 @@ namespace Spine.Unity.Playables {
ScriptPlayable<SpineAnimationStateBehaviour> inputPlayable = (ScriptPlayable<SpineAnimationStateBehaviour>)playable.GetInput(i); ScriptPlayable<SpineAnimationStateBehaviour> inputPlayable = (ScriptPlayable<SpineAnimationStateBehaviour>)playable.GetInput(i);
SpineAnimationStateBehaviour clipData = inputPlayable.GetBehaviour(); SpineAnimationStateBehaviour clipData = inputPlayable.GetBehaviour();
dontPauseWithDirector = clipData.dontPauseWithDirector;
if (clipData.animationReference == null) { if (clipData.animationReference == null) {
float mixDuration = clipData.customDuration ? clipData.mixDuration : state.Data.DefaultMix; float mixDuration = clipData.customDuration ? clipData.mixDuration : state.Data.DefaultMix;
state.SetEmptyAnimation(trackIndex, mixDuration); state.SetEmptyAnimation(trackIndex, mixDuration);