fix skeleton's setTrackXXXListener doesn't work on web platform #16512
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(cherry picked from commit 9b90131d968185bd3d73c30f1a11960a9786fbde)
dumganhar
reviewed
Nov 16, 2023
| instance->onAnimationStateEvent(entry, type, event); | ||
| } | ||
|
|
||
| void trackEntryCallback(AnimationState *state, EventType type, TrackEntry *entry, Event *event) { |
There was a problem hiding this comment.
Make the function static.
dumganhar
reviewed
Nov 16, 2023
| void trackEntryCallback(AnimationState *state, EventType type, TrackEntry *entry, Event *event) { | ||
| (static_cast<SpineSkeletonInstance *>(state->getRendererObject()))->onTrackEntryEvent(entry, type, event); | ||
| if (type == EventType_Dispose) { | ||
| if (entry->getRendererObject()) { |
There was a problem hiding this comment.
Would the renderobject be nullptr? If so, the above line
(static_cast<SpineSkeletonInstance *>(state->getRendererObject()))->onTrackEntryEvent(entry, type, event);
should also consider the situation of nullptr.
dumganhar
reviewed
Nov 16, 2023
| _trackListenerID = trackId; | ||
| entry->setRendererObject(this); | ||
| entry->setListener(trackEntryCallback); | ||
| } |
There was a problem hiding this comment.
Should we output an error if render object is invalid?
There was a problem hiding this comment.
render object only used to prevent setTrackListener multi times
There was a problem hiding this comment.
So setTrackListener could not be invoked multiple times for the same trackId?
If I want to replace entry for the same trackId, how to achieve that?
There was a problem hiding this comment.
trackId is generated by engine internal, one trackEntry only has one trackListener. While dispose_event called, trackEntry's listener will be reset to null.
Interface Check Report! WARNING this pull request has changed these public interfaces:
@@ -51741,8 +51741,9 @@
dtRate: number;
isCache: boolean;
isDelete: boolean;
enable: boolean;
+ setTrackEntryListener: any;
initSkeleton(data: SkeletonData);
getAnimationState();
setAnimation(trackIndex: number, name: string, loop: boolean): spine.TrackEntry | null;
setSkin(name: string);
@@ -67139,10 +67140,11 @@
end?: ((entry: sp.spine.TrackEntry) => void);
dispose?: ((entry: sp.spine.TrackEntry) => void);
complete?: ((entry: sp.spine.TrackEntry) => void);
event?: ((entry: sp.spine.TrackEntry, event: sp.spine.Event) => void);
- static getListeners(entry: sp.spine.TrackEntry): sp.spine.AnimationStateListener;
+ static getListeners(entry: sp.spine.TrackEntry, instance: sp.spine.SkeletonInstance): sp.spine.AnimationStateListener;
static emitListener(id: number, entry: sp.spine.TrackEntry, event: sp.spine.Event): void;
+ static emitTrackEntryListener(id: number, entry: sp.spine.TrackEntry, event: sp.spine.Event, eventType: sp.spine.EventType): void;
static addListener(listener: _cocos_spine_track_entry_listeners__CommonTrackEntryListener): number;
}
export class _cocos_spine_skeleton_cache__SpineDrawItem {
iCount: number;
|
minggo
reviewed
Nov 16, 2023
native/cocos/editor-support/spine-wasm/spine-skeleton-instance.h
Outdated
Show resolved
Hide resolved
native/cocos/editor-support/spine-wasm/spine-skeleton-instance.h
Outdated
Show resolved
Hide resolved
| curTrack.listener.event(entry, event); | ||
| } | ||
| break; | ||
| } |
There was a problem hiding this comment.
It is better to handle default case and print an error/warning log.
minggo
approved these changes
Nov 16, 2023
dumganhar
approved these changes
Nov 16, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Re: # #16493
Changelog
Continuous Integration
This pull request:
Compatibility Check
This pull request: