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

Opt-in C# events for SkeletonAnimator.

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

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

@ -41,7 +41,7 @@ namespace Spine.Unity {
float lastTime; float lastTime;
#if USE_SPINE_EVENTS #if USE_SPINE_EVENTS
public delegate void SkeletonAnimatorEventDelegate (Spine.Event firedEvent); public delegate void SkeletonAnimatorEventDelegate (Spine.Event firedEvent, float weight);
public event SkeletonAnimatorEventDelegate AnimationEvent; public event SkeletonAnimatorEventDelegate AnimationEvent;
public readonly ExposedList<Spine.Event> events = new ExposedList<Spine.Event>(); public readonly ExposedList<Spine.Event> events = new ExposedList<Spine.Event>();
#else #else
@ -113,6 +113,9 @@ namespace Spine.Unity {
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, events, weight); animationTable[GetAnimationClipNameHashCode(info.clip)].Mix(skeleton, Mathf.Max(0, time - deltaTime), time, stateInfo.loop, events, weight);
#if USE_SPINE_EVENTS
FireEvents(events, weight, this.AnimationEvent);
#endif
} }
#if UNITY_5 #if UNITY_5
if (nextStateInfo.fullPathHash != 0) { if (nextStateInfo.fullPathHash != 0) {
@ -127,6 +130,9 @@ namespace Spine.Unity {
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, events, weight); animationTable[GetAnimationClipNameHashCode(info.clip)].Mix(skeleton, Mathf.Max(0, time - deltaTime), time, nextStateInfo.loop, events, weight);
#if USE_SPINE_EVENTS
FireEvents(events, weight, this.AnimationEvent);
#endif
} }
} }
} else if (mode >= MixMode.MixNext) { } else if (mode >= MixMode.MixNext) {
@ -141,6 +147,9 @@ namespace Spine.Unity {
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, events); animationTable[GetAnimationClipNameHashCode(info.clip)].Apply(skeleton, Mathf.Max(0, time - deltaTime), time, stateInfo.loop, events);
#if USE_SPINE_EVENTS
FireEvents(events, weight, this.AnimationEvent);
#endif
break; break;
} }
@ -153,6 +162,9 @@ namespace Spine.Unity {
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, events, weight); animationTable[GetAnimationClipNameHashCode(info.clip)].Mix(skeleton, Mathf.Max(0, time - deltaTime), time, stateInfo.loop, events, weight);
#if USE_SPINE_EVENTS
FireEvents(events, weight, this.AnimationEvent);
#endif
} }
c = 0; c = 0;
@ -171,6 +183,9 @@ namespace Spine.Unity {
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, events); animationTable[GetAnimationClipNameHashCode(info.clip)].Apply(skeleton, Mathf.Max(0, time - deltaTime), time, nextStateInfo.loop, events);
#if USE_SPINE_EVENTS
FireEvents(events, weight, this.AnimationEvent);
#endif
break; break;
} }
} }
@ -184,23 +199,14 @@ namespace Spine.Unity {
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, events, weight); animationTable[GetAnimationClipNameHashCode(info.clip)].Mix(skeleton, Mathf.Max(0, time - deltaTime), time, nextStateInfo.loop, events, weight);
#if USE_SPINE_EVENTS
FireEvents(events, weight, this.AnimationEvent);
#endif
} }
} }
} }
} }
#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);
@ -227,5 +233,20 @@ namespace Spine.Unity {
return clipNameHashCode; return clipNameHashCode;
} }
#if USE_SPINE_EVENTS
static void FireEvents (ExposedList<Spine.Event> eventList, float weight, SkeletonAnimatorEventDelegate callback) {
int eventsCount = eventList.Count;
if (eventsCount > 0) {
var eventListItems = eventList.Items;
for (int i = 0; i < eventsCount; i++) {
if (callback != null)
callback(eventListItems[i], weight);
}
eventList.Clear(false);
}
}
#endif
} }
} }