UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-04 14:24:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add listener to animation state rather than on each track.

Browse Source
This commit is contained in:
Davide Tantillo 2026-01-12 16:33:37 +01:00
parent 329ff5b073
commit 6aedab232e
1 changed files with 14 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
spine-ts/spine-construct3/src/c3runtime/instance.ts
View File

@ -1,4 +1,4 @@
import type { AnimationState, AnimationStateListener, AssetLoader, Bone, C3Matrix, C3RendererRuntime, Event, NumberArrayLike, RegionAttachment, Skeleton, Skin, Slot, SpineBoundsProvider, SpineBoundsProviderType, TextureAtlas, } from "@esotericsoftware/spine-construct3-lib"; import type { AnimationState, AssetLoader, Bone, C3Matrix, C3RendererRuntime, Event, NumberArrayLike, RegionAttachment, Skeleton, Skin, Slot, SpineBoundsProvider, SpineBoundsProviderType, TextureAtlas, } from "@esotericsoftware/spine-construct3-lib";
const C3 = globalThis.C3; const C3 = globalThis.C3;
const spine = globalThis.spine; const spine = globalThis.spine;
@ -426,11 +426,16 @@ class SpineC3Instance extends globalThis.ISDKWorldInstanceBase {
this.skeleton = new spine.Skeleton(skeletonData); this.skeleton = new spine.Skeleton(skeletonData);
const animationStateData = new spine.AnimationStateData(skeletonData); const animationStateData = new spine.AnimationStateData(skeletonData);
this.state = new spine.AnimationState(animationStateData); this.state = new spine.AnimationState(animationStateData);
this.state.addListener({
start: (entry) => this.triggerAnimationEvent("start", entry.trackIndex, entry.animation?.name ?? ""),
dispose: (entry) => this.triggerAnimationEvent("dispose", entry.trackIndex, entry.animation?.name ?? ""),
event: (entry, event) => this.triggerAnimationEvent("event", entry.trackIndex, entry.animation?.name ?? "", event),
interrupt: (entry) => this.triggerAnimationEvent("interrupt", entry.trackIndex, entry.animation?.name ?? ""),
end: (entry) => this.triggerAnimationEvent("end", entry.trackIndex, entry.animation?.name ?? ""),
complete: (entry) => this.triggerAnimationEvent("complete", entry.trackIndex, entry.animation?.name ?? ""),
});
if (this.propAnimation) { if (this.propAnimation) this.setAnimation(0, this.propAnimation, true);
this.setAnimation(0, this.propAnimation, true);
this.isPlaying = true;
}
this._setSkin(); this._setSkin();
@ -473,20 +478,14 @@ class SpineC3Instance extends globalThis.ISDKWorldInstanceBase {
public setAnimation (track: number, animation: string, loop = false) { public setAnimation (track: number, animation: string, loop = false) {
const { state } = this; const { state } = this;
if (!state) return; if (!state) return;
state.setAnimation(track, animation, loop);
const trackEntry = state.setAnimation(track, animation, loop);
trackEntry.listener = this.makeTrackListener(track, animation);
this.isPlaying = true; this.isPlaying = true;
} }
public addAnimation (track: number, animation: string, loop = false, delay = 0) { public addAnimation (track: number, animation: string, loop = false, delay = 0) {
const { state } = this; const { state } = this;
if (!state) return; if (!state) return;
state.addAnimation(track, animation, loop, delay);
const trackEntry = state.addAnimation(track, animation, loop, delay);
trackEntry.listener = this.makeTrackListener(track, animation);
this.isPlaying = true; this.isPlaying = true;
} }
@ -588,15 +587,6 @@ class SpineC3Instance extends globalThis.ISDKWorldInstanceBase {
this._trigger(C3.Plugins.EsotericSoftware_SpineConstruct3.Cnds.OnAnimationEvent); this._trigger(C3.Plugins.EsotericSoftware_SpineConstruct3.Cnds.OnAnimationEvent);
} }
private makeTrackListener = (track: number, animation: string): AnimationStateListener => ({
start: () => this.triggerAnimationEvent("start", track, animation),
dispose: () => this.triggerAnimationEvent("dispose", track, animation),
event: (_, event) => this.triggerAnimationEvent("event", track, animation, event),
interrupt: () => this.triggerAnimationEvent("interrupt", track, animation),
end: () => this.triggerAnimationEvent("end", track, animation),
complete: () => this.triggerAnimationEvent("complete", track, animation),
})
/**********/ /**********/
/* /*
@ -628,19 +618,13 @@ class SpineC3Instance extends globalThis.ISDKWorldInstanceBase {
} else if (skins.length === 1) { } else if (skins.length === 1) {
const skinName = skins[0]; const skinName = skins[0];
const skin = skeleton.data.findSkin(skinName); const skin = skeleton.data.findSkin(skinName);
if (!skin) { if (!skin) throw new Error(`The given skin is not present in the skeleton data: ${skinName}`);
// TODO: signal error
return;
}
skeleton.setSkin(skins[0]); skeleton.setSkin(skins[0]);
} else { } else {
const customSkin = new spine.Skin(skins.join(",")); const customSkin = new spine.Skin(skins.join(","));
for (const s of skins) { for (const s of skins) {
const skin = skeleton.data.findSkin(s) const skin = skeleton.data.findSkin(s)
if (!skin) { if (!skin) throw new Error(`The given skin is not present in the skeleton data: ${s}`);
// TODO: signal error
return;
}
customSkin.addSkin(skin); customSkin.addSkin(skin);
} }
skeleton.setSkin(customSkin); skeleton.setSkin(customSkin);