Skip to content

Commit 9bc4402

Browse files
yaustarsteveny-sc
andauthored
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 <syau@snapchat.com>
1 parent 5497227 commit 9bc4402

5 files changed

Lines changed: 5 additions & 5 deletions

File tree

build/playcanvas-spine.3.6.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7334,7 +7334,7 @@ pc.extend(pc, function () {
73347334
var textureData = {};
73357335
for (var i = 0, n = this.textureAssets.length; i < n; i++) {
73367336
var asset = this.system.app.assets.get(this.textureAssets[i]);
7337-
var path = asset.file ? asset.file.filename : null;
7337+
var path = asset.name ? asset.name : (asset.file ? asset.file.filename : null);
73387338
// Fallback if filename doesn't exist
73397339
if (!path) {
73407340
path = pc.path.getBasename(asset.file.url);

build/playcanvas-spine.3.6.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/playcanvas-spine.3.8.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8894,7 +8894,7 @@ pc.extend(pc, function () {
88948894
var textureData = {};
88958895
for (var i = 0, n = this.textureAssets.length; i < n; i++) {
88968896
var asset = this.system.app.assets.get(this.textureAssets[i]);
8897-
var path = asset.file ? asset.file.filename : null;
8897+
var path = asset.name ? asset.name : (asset.file ? asset.file.filename : null);
88988898
// Fallback if filename doesn't exist
88998899
if (!path) {
89008900
path = pc.path.getBasename(asset.file.url);

build/playcanvas-spine.3.8.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/component/spine-component.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ pc.extend(pc, function () {
2323
var textureData = {};
2424
for (var i = 0, n = this.textureAssets.length; i < n; i++) {
2525
var asset = this.system.app.assets.get(this.textureAssets[i]);
26-
var path = asset.file ? asset.file.filename : null;
26+
var path = asset.name ? asset.name : (asset.file ? asset.file.filename : null);
2727
// Fallback if filename doesn't exist
2828
if (!path) {
2929
path = pc.path.getBasename(asset.file.url);

0 commit comments

Comments
 (0)