Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the issue on the web where calling spine.setAttachment causes visual glitches due to using incorrect textures. #18002

Merged
merged 10 commits into from
Dec 13, 2024

Conversation

bofeng-song
Copy link
Contributor

@bofeng-song bofeng-song commented Dec 4, 2024

Re: #
https://forum.cocos.org/t/topic/160058/60
https://forum.cocos.org/t/topic/153213

Changelog


Continuous Integration

This pull request:

  • needs automatic test cases check.

    Manual trigger with @cocos-robot run test cases afterward.

  • does not change any runtime related code or build configuration

    If any reviewer thinks the CI checks are needed, please uncheck this option, then close and reopen the issue.


Compatibility Check

This pull request:

  • changes public API, and have ensured backward compatibility with deprecated features.
  • affects platform compatibility, e.g. system version, browser version, platform sdk version, platform toolchain, language version, hardware compatibility etc.
  • affects file structure of the build package or build configuration which requires user project upgrade.
  • introduces breaking changes, please list all changes, affected features and the scope of violation.

Copy link

github-actions bot commented Dec 4, 2024

⚠️ Package size ⤴ 848 bytes, old: 5441602, new: 5442450

Interface Check Report

! WARNING this pull request has changed these public interfaces:

@@ -52714,18 +52714,18 @@
                 setListener(id: number);
                 setDebugMode(debug: boolean);
                 getDebugShapes();
                 resizeSlotRegion(slotName: string, width: number, height: number, createNew: boolean);
-                setSlotTexture(slotName: string, index: number);
+                setSlotTexture(slotName: string, uuid: string);
             }
             export class wasmUtil {
                 static spineWasmInit(): void;
                 static spineWasmDestroy(): void;
                 static freeStoreMemory(): void;
                 static createStoreMemory(size: number): number;
                 static querySpineSkeletonDataByUUID(uuid: string): SkeletonData;
-                static createSpineSkeletonDataWithJson(jsonStr: string, atlasText: string): SkeletonData;
-                static createSpineSkeletonDataWithBinary(byteSize: number, atlasText: string): SkeletonData;
+                static createSpineSkeletonDataWithJson(jsonStr: string, atlasText: string, textureNames: string[], textureUUIDs: string[]): SkeletonData;
+                static createSpineSkeletonDataWithBinary(byteSize: number, atlasText: string, textureNames: string[], textureUUIDs: string[]): SkeletonData;
                 static registerSpineSkeletonDataWithUUID(data: SkeletonData, uuid: string);
                 static destroySpineSkeletonDataWithUUID(uuid: string);
                 static destroySpineSkeleton(skeleton: Skeleton): void;
                 static getCurrentListenerID(): number;

auto* skin = skins[i];
auto entries = skin->getAttachments();
while (entries.hasNext()) {
Skin::AttachmentMap::Entry entry = entries.next();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use reference too.

@@ -5,11 +5,11 @@

class AttachmentVertices {
public:
AttachmentVertices(int verticesCount, uint16_t *triangles, int trianglesCount, uint32_t textureId);
AttachmentVertices(int verticesCount, uint16_t *triangles, int trianglesCount, const spine::String& textureId);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this PR, you changed the parameter type from uint32_t to const spine::String & which indicates the region-page-name, it's a texture atlas name, right? If so , using the old textureId name seems not to be suitable.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After call the function updateAttachmentVerticesTextureId, texture will store texute's uuid

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So I recommend to rename the parameter name to textureUUID.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

@minggo
Copy link
Contributor

minggo commented Dec 11, 2024

  • please fix conflict
  • please fix eslint error with new codes

cocos/spine/skeleton.ts Outdated Show resolved Hide resolved
@minggo minggo merged commit 6103fe4 into cocos:v3.8.6 Dec 13, 2024
25 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants