Fixed issue with Basis compressed sprite sheets (#51)

https://forum.playcanvas.com/t/playcanvas-1-46-1-playcanvas-spine-console-error/21679 Co-authored-by: Steven Yau <[email protected]>
playcanvas · Aug 31, 2021 · 9bc4402 · 9bc4402
1 parent 5497227
commit 9bc4402
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/build/playcanvas-spine.3.6.js b/build/playcanvas-spine.3.6.js
@@ -7334,7 +7334,7 @@ pc.extend(pc, function () {
             var textureData = {};
             for (var i = 0, n = this.textureAssets.length; i < n; i++) {
                 var asset = this.system.app.assets.get(this.textureAssets[i]);
-                var path = asset.file ? asset.file.filename : null;
+                var path = asset.name ? asset.name : (asset.file ? asset.file.filename : null);
                 // Fallback if filename doesn't exist
                 if (!path) {
                     path = pc.path.getBasename(asset.file.url);

diff --git a/build/playcanvas-spine.3.6.min.js b/build/playcanvas-spine.3.6.min.js
diff --git a/build/playcanvas-spine.3.8.js b/build/playcanvas-spine.3.8.js
@@ -8894,7 +8894,7 @@ pc.extend(pc, function () {
             var textureData = {};
             for (var i = 0, n = this.textureAssets.length; i < n; i++) {
                 var asset = this.system.app.assets.get(this.textureAssets[i]);
-                var path = asset.file ? asset.file.filename : null;
+                var path = asset.name ? asset.name : (asset.file ? asset.file.filename : null);
                 // Fallback if filename doesn't exist
                 if (!path) {
                     path = pc.path.getBasename(asset.file.url);

diff --git a/build/playcanvas-spine.3.8.min.js b/build/playcanvas-spine.3.8.min.js
diff --git a/src/component/spine-component.js b/src/component/spine-component.js
@@ -23,7 +23,7 @@ pc.extend(pc, function () {
             var textureData = {};
             for (var i = 0, n = this.textureAssets.length; i < n; i++) {
                 var asset = this.system.app.assets.get(this.textureAssets[i]);
-                var path = asset.file ? asset.file.filename : null;
+                var path = asset.name ? asset.name : (asset.file ? asset.file.filename : null);
                 // Fallback if filename doesn't exist
                 if (!path) {
                     path = pc.path.getBasename(asset.file.url);