Search for textures in page property

To support 4.0, textures are stored under the page property.
playcanvas · Sep 15, 2023 · d603386 · d603386
1 parent d0ce5a4
commit d603386
Showing 1 changed file with 30 additions and 21 deletions.
diff --git a/src/component/Spine.js b/src/component/Spine.js
@@ -254,29 +254,38 @@ class Spine {
                 slot._active.type = ATTACHMENT_TYPE.MESH;
             }
 
+            let texture = null;
+
+            // search for texture property if it exists
+            if (attachment.region) {
+                if (attachment.region.texture) {
+                    texture = attachment.region.texture.pcTexture;
+                }
+                if (attachment.region.page && attachment.region.page.texture) {
+                    texture = attachment.region.page.texture.pcTexture;
+                }
+            }
+
             // create / assign material
-            if (attachment.region && attachment.region.texture) {
-                const texture = attachment.region.texture.pcTexture;
-                if (texture) {
-                    if (texture instanceof pc.StandardMaterial) {
-                        this._materials[texture.name] = texture;
-                        slot.material = texture.name;
-                    } else {
-                        // get a unique key for the texture
-                        let key = null;
-                        if (texture.name) {
-                            key = texture.name; // texture name might not be unique - should be resolved with content
-                        } else if (texture.getSource() instanceof Image) {
-                            key = texture.getSource().getAttribute('src');
-                        }
-                        if (key) {
-                            // create a new material if required
-                            if (this._materials[key] === undefined) {
-                                const material = this.createMaterial(texture);
-                                this._materials[key] = material;
-                            }
-                            slot.material = key;
+            if (texture) {
+                if (texture instanceof pc.StandardMaterial) {
+                    this._materials[texture.name] = texture;
+                    slot.material = texture.name;
+                } else {
+                    // get a unique key for the texture
+                    let key = null;
+                    if (texture.name) {
+                        key = texture.name; // texture name might not be unique - should be resolved with content
+                    } else if (texture.getSource() instanceof Image) {
+                        key = texture.getSource().getAttribute('src');
+                    }
+                    if (key) {
+                        // create a new material if required
+                        if (this._materials[key] === undefined) {
+                            const material = this.createMaterial(texture);
+                            this._materials[key] = material;
                         }
+                        slot.material = key;
                     }
                 }
             }