Fix display abnormaly due to use wrong AttachementVertices (#18692)

bofeng-song · web-flow · commit 1d3785d678d9 · 2025-05-07T19:24:21.000+08:00
* Fix display abnormaly due to use wrong AttachementVertices

* refine

* Update external version for spine
diff --git a/native/cocos/editor-support/spine-creator-support/SkeletonDataMgr.cpp b/native/cocos/editor-support/spine-creator-support/SkeletonDataMgr.cpp
@@ -55,7 +55,14 @@ class SkeletonDataInfo {
             for (int i = 0; i < size; i++) {
                 auto *region = regions[i];
                 if (region->rendererObject) {
-                    delete static_cast<AttachmentVertices *>(region->rendererObject);
+                    auto *map = static_cast<spine::HashMap<Attachment *, AttachmentVertices *> *>(region->rendererObject);
+                    auto entries = map->getEntries();
+                    while (entries.hasNext()) {
+                        auto entry = entries.next();
+                        auto *attachmentVertices = entry.value;
+                        delete attachmentVertices;
+                    }
+                    delete map;
                     region->rendererObject = nullptr;
                 }
             }
diff --git a/native/cocos/editor-support/spine-creator-support/SkeletonRenderer.cpp b/native/cocos/editor-support/spine-creator-support/SkeletonRenderer.cpp
@@ -453,7 +453,8 @@ void SkeletonRenderer::render(float /*deltaTime*/) {
 #if CC_USE_SPINE_3_8
                 attachmentVertices = reinterpret_cast<AttachmentVertices *>(attachment->getRendererObject());
 #else
-                attachmentVertices = reinterpret_cast<AttachmentVertices *>(attachment->getRegion()->rendererObject);
+                auto *tmpMap = static_cast<spine::HashMap<Attachment *, AttachmentVertices *> *>(attachment->getRegion()->rendererObject);
+                attachmentVertices = (*tmpMap)[attachment];
 #endif
             }
 
@@ -524,7 +525,8 @@ void SkeletonRenderer::render(float /*deltaTime*/) {
 #if CC_USE_SPINE_3_8
                 attachmentVertices = static_cast<AttachmentVertices *>(attachment->getRendererObject());
 #else
-                attachmentVertices = static_cast<AttachmentVertices *>(attachment->getRegion()->rendererObject);
+                auto *tmpMap = static_cast<spine::HashMap<Attachment *, AttachmentVertices *> *>(attachment->getRegion()->rendererObject);
+                attachmentVertices = (*tmpMap)[attachment];
 #endif
             }
 
@@ -1180,7 +1182,8 @@ void SkeletonRenderer::setSlotTexture(const std::string &slotName, cc::Texture2D
         uvs[0] = 1;
         uvs[1] = 1;
         region->updateRegion();
-        attachmentVertices = static_cast<AttachmentVertices *>(textureRegion->rendererObject);
+        auto *tmpMap = static_cast<spine::HashMap<Attachment *, AttachmentVertices *> *>(textureRegion->rendererObject);
+        attachmentVertices = (*tmpMap)[slot->getAttachment()];
         if (createAttachment) {
             attachmentVertices = attachmentVertices->copy();
             slotCacheInfo.attachmentVertices = attachmentVertices;
@@ -1229,7 +1232,8 @@ void SkeletonRenderer::setSlotTexture(const std::string &slotName, cc::Texture2D
         mesh->setWidth(width);
         mesh->setHeight(height);
         mesh->updateRegion();
-        attachmentVertices = static_cast<AttachmentVertices *>(mesh->getRegion()->rendererObject);
+        auto *tmpMap = static_cast<spine::HashMap<Attachment *, AttachmentVertices *> *>(mesh->getRegion()->rendererObject);
+        attachmentVertices = (*tmpMap)[slot->getAttachment()];
         if (createAttachment) {
             attachmentVertices = attachmentVertices->copy();
             slotCacheInfo.attachmentVertices = attachmentVertices;
diff --git a/native/cocos/editor-support/spine-creator-support/spine-cocos2dx.cpp b/native/cocos/editor-support/spine-creator-support/spine-cocos2dx.cpp
@@ -49,12 +49,30 @@ USING_NS_MW;           // NOLINT(google-build-using-namespace)
 using namespace cc;    // NOLINT(google-build-using-namespace)
 using namespace spine; // NOLINT(google-build-using-namespace)
 
+#if CC_USE_SPINE_3_8
 static void deleteAttachmentVertices(void *vertices) {
     delete static_cast<AttachmentVertices *>(vertices);
 }
+#endif
 
 static uint16_t quadTriangles[6] = {0, 1, 2, 2, 3, 0};
 
+#if CC_USE_SPINE_4_2
+/**
+* The relationship between ​​AtlasRegion​​ and ​​AttachmentVertices​​ is ​​one-to-many​​.
+*/
+static void saveAttachmentVertices(Attachment *attachment, AtlasRegion *region, AttachmentVertices *attachmentVertices) {
+    spine::HashMap<Attachment *, AttachmentVertices *> *map = nullptr;
+    if (region->rendererObject && region->rendererObject != region->page->texture) {
+        map = static_cast<spine::HashMap<Attachment *, AttachmentVertices *> *>(region->rendererObject);
+    } else {
+        map = new spine::HashMap<Attachment *, AttachmentVertices *>();
+        region->rendererObject = map;
+    }
+    map->put(attachment, attachmentVertices);
+}
+#endif
+
 static void setAttachmentVertices(RegionAttachment *attachment) {
 #if CC_USE_SPINE_3_8
     auto *region = static_cast<AtlasRegion *>(attachment->getRendererObject());
@@ -71,7 +89,7 @@ static void setAttachmentVertices(RegionAttachment *attachment) {
 #if CC_USE_SPINE_3_8
     attachment->setRendererObject(attachmentVertices, deleteAttachmentVertices);
 #else
-    attachment->getRegion()->rendererObject = attachmentVertices;
+   saveAttachmentVertices(attachment, region, attachmentVertices);
 #endif
 }
 
@@ -93,7 +111,7 @@ static void setAttachmentVertices(MeshAttachment *attachment) {
 #if CC_USE_SPINE_3_8
     attachment->setRendererObject(attachmentVertices, deleteAttachmentVertices);
 #else
-    attachment->getRegion()->rendererObject = attachmentVertices;
+    saveAttachmentVertices(attachment, region, attachmentVertices);
 #endif
 }
 
diff --git a/native/cocos/editor-support/spine-wasm/AtlasAttachmentLoaderExtension.cpp b/native/cocos/editor-support/spine-wasm/AtlasAttachmentLoaderExtension.cpp
@@ -41,6 +41,20 @@ AttachmentVertices *AttachmentVertices::copy() {
 static void deleteAttachmentVertices(void *vertices) {
     delete static_cast<AttachmentVertices *>(vertices);
 }
+#else
+/**
+* The relationship between ​​AtlasRegion​​ and ​​AttachmentVertices​​ is ​​one-to-many​​.
+*/
+static void saveAttachmentVertices(Attachment *attachment, AtlasRegion *region, AttachmentVertices *attachmentVertices) {
+    spine::HashMap<Attachment *, AttachmentVertices *> *map = nullptr;
+    if (region->rendererObject && region->rendererObject != region->page->texture) {
+        map = static_cast<spine::HashMap<Attachment *, AttachmentVertices *> *>(region->rendererObject);
+    } else {
+        map = new spine::HashMap<Attachment *, AttachmentVertices *>();
+        region->rendererObject = map;
+    }
+    map->put(attachment, attachmentVertices);
+}
 #endif
 
 AtlasAttachmentLoaderExtension::AtlasAttachmentLoaderExtension(Atlas *atlas) : AtlasAttachmentLoader(atlas), _atlasCache(atlas) {
@@ -67,7 +81,7 @@ void AtlasAttachmentLoaderExtension::configureAttachment(Attachment *attachment)
 #ifdef CC_SPINE_VERSION_3_8
         regionAttachment->setRendererObject(attachmentVertices, deleteAttachmentVertices);
 #else
-        regionAttachment->getRegion()->rendererObject = attachmentVertices;
+        saveAttachmentVertices(attachment, region, attachmentVertices);
 #endif
     } else if (attachment->getRTTI().isExactly(MeshAttachment::rtti)) {
         auto *meshAttachment = static_cast<MeshAttachment *>(attachment);
@@ -88,7 +102,7 @@ void AtlasAttachmentLoaderExtension::configureAttachment(Attachment *attachment)
 #ifdef CC_SPINE_VERSION_3_8
         meshAttachment->setRendererObject(attachmentVertices, deleteAttachmentVertices);
 #else
-        meshAttachment->getRegion()->rendererObject = attachmentVertices;
+        saveAttachmentVertices(attachment, region, attachmentVertices);
 #endif
     } else {
         wasmLog(attachment->getName().buffer());
diff --git a/native/cocos/editor-support/spine-wasm/spine-skeleton-instance.cpp b/native/cocos/editor-support/spine-wasm/spine-skeleton-instance.cpp
@@ -209,7 +209,8 @@ void SpineSkeletonInstance::collectMeshData() {
 #ifdef CC_SPINE_VERSION_3_8
                 attachmentVertices = reinterpret_cast<AttachmentVertices *>(attachment->getRendererObject());
 #else
-                attachmentVertices = reinterpret_cast<AttachmentVertices *>(attachment->getRegion()->rendererObject);
+                auto *tmpMap = static_cast<spine::HashMap<Attachment *, AttachmentVertices *> *>(attachment->getRegion()->rendererObject);
+                attachmentVertices = (*tmpMap)[slot->getAttachment()];
 #endif
             }
 
@@ -251,7 +252,8 @@ void SpineSkeletonInstance::collectMeshData() {
 #ifdef CC_SPINE_VERSION_3_8
                 attachmentVertices = static_cast<AttachmentVertices *>(attachment->getRendererObject());
 #else
-                attachmentVertices = static_cast<AttachmentVertices *>(attachment->getRegion()->rendererObject);
+                auto *tmpMap = static_cast<spine::HashMap<Attachment *, AttachmentVertices *> *>(attachment->getRegion()->rendererObject);
+                attachmentVertices = (*tmpMap)[slot->getAttachment()];
 #endif
             }
 
@@ -579,7 +581,8 @@ void SpineSkeletonInstance::resizeSlotRegion(const spine::String &slotName, uint
         uvs[0] = 1;
         uvs[1] = 1;
         region->updateRegion();
-        auto *attachmentVertices = static_cast<AttachmentVertices *>(region->getRegion()->rendererObject);
+        auto *tmpMap = static_cast<spine::HashMap<Attachment *, AttachmentVertices *> *>(textureRegion->rendererObject);
+        auto *attachmentVertices = (*tmpMap)[slot->getAttachment()];
         if (createNew) {
             attachmentVertices = attachmentVertices->copy();
             info.attachmentVertices = attachmentVertices;
@@ -628,7 +631,8 @@ void SpineSkeletonInstance::resizeSlotRegion(const spine::String &slotName, uint
         mesh->setWidth(width);
         mesh->setHeight(height);
         mesh->updateRegion();
-        auto *attachmentVertices = static_cast<AttachmentVertices *>(mesh->getRegion()->rendererObject);
+        auto *tmpMap = static_cast<spine::HashMap<Attachment *, AttachmentVertices *> *>(mesh->getRegion()->rendererObject);
+        auto *attachmentVertices = (*tmpMap)[slot->getAttachment()];
         if (createNew) {
             attachmentVertices = attachmentVertices->copy();
             info.attachmentVertices = attachmentVertices;
diff --git a/native/cocos/editor-support/spine-wasm/spine-wasm.cpp b/native/cocos/editor-support/spine-wasm/spine-wasm.cpp
@@ -48,21 +48,24 @@ void updateAttachmentVerticesTextureId(SkeletonData* skeletonData, const spine::
         auto entries = skin->getAttachments();
         while (entries.hasNext()) {
             Skin::AttachmentMap::Entry& entry = entries.next();
-            AttachmentVertices* attachmentVertices;
+            AttachmentVertices* attachmentVertices = nullptr;
             auto* attachment = entry._attachment;
+            spine::HashMap<Attachment *, AttachmentVertices *> *map = nullptr;
             if (attachment->getRTTI().isExactly(MeshAttachment::rtti)) {
                 auto* meshAttachment = static_cast<MeshAttachment*>(attachment);
 #ifdef CC_SPINE_VERSION_3_8
                 attachmentVertices = static_cast<AttachmentVertices*>(meshAttachment->getRendererObject());
 #else
-                attachmentVertices = static_cast<AttachmentVertices*>(meshAttachment->getRegion()->rendererObject);
+                map = static_cast<spine::HashMap<Attachment *, AttachmentVertices *> *>(meshAttachment->getRegion()->rendererObject);
+                attachmentVertices = (*map)[attachment];
 #endif
             } else if (attachment->getRTTI().isExactly(RegionAttachment::rtti)) {
                 auto* regionAttachment = static_cast<RegionAttachment*>(attachment);
 #ifdef CC_SPINE_VERSION_3_8
                 attachmentVertices = static_cast<AttachmentVertices*>(regionAttachment->getRendererObject());
 #else
-                attachmentVertices = static_cast<AttachmentVertices*>(regionAttachment->getRegion()->rendererObject);
+                map = static_cast<spine::HashMap<Attachment *, AttachmentVertices *> *>(regionAttachment->getRegion()->rendererObject);
+                attachmentVertices = (*map)[attachment];
 #endif
             }
             if (attachmentVertices) {
@@ -184,17 +187,25 @@ void SpineWasmUtil::destroySpineSkeletonDataWithUUID(const String& uuid) {
             auto entries = skin->getAttachments();
             while (entries.hasNext()) {
                 Skin::AttachmentMap::Entry& entry = entries.next();
-                AttachmentVertices* attachmentVertices;
                 auto* attachment = entry._attachment;
+                spine::HashMap<Attachment *, AttachmentVertices *> *map = nullptr;
                 if (attachment->getRTTI().isExactly(MeshAttachment::rtti)) {
                     auto* meshAttachment = static_cast<MeshAttachment*>(attachment);
-                    attachmentVertices = static_cast<AttachmentVertices*>(meshAttachment->getRegion()->rendererObject);
+                    map = static_cast<spine::HashMap<Attachment *, AttachmentVertices *> *>(meshAttachment->getRegion()->rendererObject);
+                    meshAttachment->getRegion()->rendererObject = nullptr;
                 } else if (attachment->getRTTI().isExactly(RegionAttachment::rtti)) {
                     auto* regionAttachment = static_cast<RegionAttachment*>(attachment);
-                    attachmentVertices = static_cast<AttachmentVertices*>(regionAttachment->getRegion()->rendererObject);
+                    map = static_cast<spine::HashMap<Attachment *, AttachmentVertices *> *>(regionAttachment->getRegion()->rendererObject);
+                    regionAttachment->getRegion()->rendererObject = nullptr;
                 }
-                if (attachmentVertices) {
-                    delete attachmentVertices;
+                if (map) {
+                    auto attachmentVerticesEntries = map->getEntries();
+                    while (attachmentVerticesEntries.hasNext()) {
+                        auto entryTmp = attachmentVerticesEntries.next();
+                        auto *attachmentVertices = entryTmp.value;
+                        delete attachmentVertices;
+                    }
+                    delete map;
                 }
             }
         }
diff --git a/native/external-config.json b/native/external-config.json
@@ -3,6 +3,6 @@
         "type": "github",
         "owner": "cocos",
         "name": "cocos-engine-external",
-        "checkout": "v3.8.7-12"
+        "checkout": "v3.8.7-13"
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@`
`3`	`3`	`"type": "github",`
`4`	`4`	`"owner": "cocos",`
`5`	`5`	`"name": "cocos-engine-external",`
`6`		`- "checkout": "v3.8.7-12"`
	`6`	`+ "checkout": "v3.8.7-13"`
`7`	`7`	`}`
`8`	`8`	`}`