Remove unneed code & Synchronize native and wasm's logic #18752
+0
−11
Conversation
This file contains hidden or 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
bofeng-song
commented
May 29, 2025
| @@ -975,7 +975,6 @@ export class Skeleton extends UIRenderer { | |||
| this._animationName = name; | |||
| trackEntry = this._instance!.setAnimation(trackIndex, name, loop); | |||
| } | |||
| this._markForUpdateRenderData(); | |||
There was a problem hiding this comment.
This logic does not exist at jsb-spine-skeleton.js(native platform). So remove it to synchronize with native.
bofeng-song
commented
May 29, 2025
| @@ -190,7 +190,6 @@ TrackEntry *SkeletonAnimation::setAnimation(int trackIndex, const std::string &n | |||
| return nullptr; | |||
| } | |||
| auto *trackEntry = _state->setAnimation(trackIndex, animation, loop); | |||
| _state->apply(*_skeleton); | |||
There was a problem hiding this comment.
Spine's official code doesn`t contain apply logic.
Official code
bofeng-song
commented
May 29, 2025
| @@ -241,7 +240,6 @@ TrackEntry *SkeletonAnimation::getCurrent(int trackIndex) { | |||
| void SkeletonAnimation::clearTracks() { | |||
| if (_state) { | |||
| _state->clearTracks(); | |||
| super::setToSetupPose(); | |||
There was a problem hiding this comment.
Spine's official code doesn`t contain apply logic.
Official code
bofeng-song
commented
May 29, 2025
| @@ -175,17 +175,9 @@ TrackEntry *SpineSkeletonInstance::setAnimation(float trackIndex, const spine::S | |||
| if (!_skeleton) return nullptr; | |||
| spine::Animation *animation = _skeleton->getData()->findAnimation(name); | |||
| if (!animation) { | |||
| _animState->clearTracks(); | |||
There was a problem hiding this comment.
Synchronize with native's logic
bofeng-song
commented
May 29, 2025
| return nullptr; | ||
| } | ||
| auto *trackEntry = _animState->setAnimation(trackIndex, animation, loop); | ||
| _animState->apply(*_skeleton); |
There was a problem hiding this comment.
Synchronize with native's logic
|
@cocos-robot run test cases |
|
@bofeng-song, Please check the result of
Task Details
|
|
@bofeng-song, Please check the result of
Task Details |
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: #
#18596
#18580
Changelog
Continuous Integration
This pull request:
Compatibility Check
This pull request: