UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-26 11:41:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Opt-in C# events for SkeletonAnimator.

Browse Source
This commit is contained in:
John 2016-05-19 11:03:42 +08:00
parent 37ef9ec176
commit dba0245753
1 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
spine-unity/Assets/spine-unity/SkeletonAnimator.cs
View File

@ -1,9 +1,9 @@
/***************************************************************************** /*****************************************************************************
* SkeletonAnimator created by Mitch Thompson * SkeletonAnimator created by Mitch Thompson
* Full irrevocable rights and permissions granted to Esoteric Software * Full irrevocable rights and permissions granted to Esoteric Software
*****************************************************************************/ *****************************************************************************/
//#define USE_SPINE_EVENTS // Uncomment this define to use C# events to handle Spine events. (Does not disable Unity AnimationClip Events)
using UnityEngine; using UnityEngine;
using System.Collections.Generic; using System.Collections.Generic;
@ -33,17 +33,21 @@ namespace Spine.Unity {
protected event UpdateBonesDelegate _UpdateWorld; protected event UpdateBonesDelegate _UpdateWorld;
protected event UpdateBonesDelegate _UpdateComplete; protected event UpdateBonesDelegate _UpdateComplete;
public Skeleton Skeleton { public Skeleton Skeleton { get { return this.skeleton; } }
get {
return this.skeleton;
}
}
readonly Dictionary<int, Spine.Animation> animationTable = new Dictionary<int, Spine.Animation>(); readonly Dictionary<int, Spine.Animation> animationTable = new Dictionary<int, Spine.Animation>();
readonly Dictionary<AnimationClip, int> clipNameHashCodeTable = new Dictionary<AnimationClip, int>(); readonly Dictionary<AnimationClip, int> clipNameHashCodeTable = new Dictionary<AnimationClip, int>();
Animator animator; Animator animator;
float lastTime; float lastTime;
#if USE_SPINE_EVENTS
public delegate void SkeletonAnimatorEventDelegate (Spine.Event firedEvent);
public event SkeletonAnimatorEventDelegate AnimationEvent;
public readonly ExposedList<Spine.Event> events = new ExposedList<Spine.Event>();
#else
public readonly ExposedList<Spine.Event> events = null;
#endif
public override void Initialize (bool overwrite) { public override void Initialize (bool overwrite) {
if (valid && !overwrite) if (valid && !overwrite)
return; return;
@ -108,7 +112,7 @@ namespace Spine.Unity {
continue; continue;
float time = stateInfo.normalizedTime * info.clip.length; float time = stateInfo.normalizedTime * info.clip.length;
animationTable[GetAnimationClipNameHashCode(info.clip)].Mix(skeleton, Mathf.Max(0, time - deltaTime), time, stateInfo.loop, null, weight); animationTable[GetAnimationClipNameHashCode(info.clip)].Mix(skeleton, Mathf.Max(0, time - deltaTime), time, stateInfo.loop, events, weight);
} }
#if UNITY_5 #if UNITY_5
if (nextStateInfo.fullPathHash != 0) { if (nextStateInfo.fullPathHash != 0) {
@ -122,7 +126,7 @@ namespace Spine.Unity {
continue; continue;
float time = nextStateInfo.normalizedTime * info.clip.length; float time = nextStateInfo.normalizedTime * info.clip.length;
animationTable[GetAnimationClipNameHashCode(info.clip)].Mix(skeleton, Mathf.Max(0, time - deltaTime), time, nextStateInfo.loop, null, weight); animationTable[GetAnimationClipNameHashCode(info.clip)].Mix(skeleton, Mathf.Max(0, time - deltaTime), time, nextStateInfo.loop, events, weight);
} }
} }
} else if (mode >= MixMode.MixNext) { } else if (mode >= MixMode.MixNext) {
@ -136,7 +140,7 @@ namespace Spine.Unity {
continue; continue;
float time = stateInfo.normalizedTime * info.clip.length; float time = stateInfo.normalizedTime * info.clip.length;
animationTable[GetAnimationClipNameHashCode(info.clip)].Apply(skeleton, Mathf.Max(0, time - deltaTime), time, stateInfo.loop, null); animationTable[GetAnimationClipNameHashCode(info.clip)].Apply(skeleton, Mathf.Max(0, time - deltaTime), time, stateInfo.loop, events);
break; break;
} }
@ -148,7 +152,7 @@ namespace Spine.Unity {
continue; continue;
float time = stateInfo.normalizedTime * info.clip.length; float time = stateInfo.normalizedTime * info.clip.length;
animationTable[GetAnimationClipNameHashCode(info.clip)].Mix(skeleton, Mathf.Max(0, time - deltaTime), time, stateInfo.loop, null, weight); animationTable[GetAnimationClipNameHashCode(info.clip)].Mix(skeleton, Mathf.Max(0, time - deltaTime), time, stateInfo.loop, events, weight);
} }
c = 0; c = 0;
@ -166,7 +170,7 @@ namespace Spine.Unity {
continue; continue;
float time = nextStateInfo.normalizedTime * info.clip.length; float time = nextStateInfo.normalizedTime * info.clip.length;
animationTable[GetAnimationClipNameHashCode(info.clip)].Apply(skeleton, Mathf.Max(0, time - deltaTime), time, nextStateInfo.loop, null); animationTable[GetAnimationClipNameHashCode(info.clip)].Apply(skeleton, Mathf.Max(0, time - deltaTime), time, nextStateInfo.loop, events);
break; break;
} }
} }
@ -179,12 +183,24 @@ namespace Spine.Unity {
continue; continue;
float time = nextStateInfo.normalizedTime * info.clip.length; float time = nextStateInfo.normalizedTime * info.clip.length;
animationTable[GetAnimationClipNameHashCode(info.clip)].Mix(skeleton, Mathf.Max(0, time - deltaTime), time, nextStateInfo.loop, null, weight); animationTable[GetAnimationClipNameHashCode(info.clip)].Mix(skeleton, Mathf.Max(0, time - deltaTime), time, nextStateInfo.loop, events, weight);
} }
} }
} }
} }
#if USE_SPINE_EVENTS
int eventsCount = events.Count;
if (eventsCount > 0) {
var eventsItems = events.Items;
for (int i = 0; i < eventsCount; i++) {
if (AnimationEvent != null)
AnimationEvent(eventsItems[i]);
}
events.Clear(false);
}
#endif
if (_UpdateLocal != null) if (_UpdateLocal != null)
_UpdateLocal(this); _UpdateLocal(this);