From f62a0582fcf4096e187e0b7272ae68a75ca74285 Mon Sep 17 00:00:00 2001 From: Haoyu Xu Date: Fri, 2 Aug 2024 15:08:12 +0800 Subject: [PATCH] fix(showcase): fixed an issue where scaling isn't working --- showcase/src/components/settings.js | 2 +- showcase/src/libs/spine-player.js | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/showcase/src/components/settings.js b/showcase/src/components/settings.js index 2a527cd..b43cc72 100644 --- a/showcase/src/components/settings.js +++ b/showcase/src/components/settings.js @@ -509,7 +509,7 @@ export default class Settings {
- +
diff --git a/showcase/src/libs/spine-player.js b/showcase/src/libs/spine-player.js index c979d83..0112958 100644 --- a/showcase/src/libs/spine-player.js +++ b/showcase/src/libs/spine-player.js @@ -11069,6 +11069,11 @@ var spine; config.settingsScale = window.settings.scale; return config; }; + SpinePlayer.prototype.getOperatorScale = function () { + if (typeof window.settings !== "undefined") + return window.settings.scale; + return this.config.settingsScale + }; SpinePlayer.prototype.showError = function (error) { var errorDom = findWithClass(this.dom, "spine-player-error")[0]; errorDom.classList.remove("spine-player-hidden"); @@ -11395,7 +11400,7 @@ var spine; var viewportSize = this.scale(viewport.width, viewport.height, this.canvas.width, this.canvas.height); // this.sceneRenderer.camera.zoom = viewport.width * devicePixelRatio / viewportSize.x; - this.sceneRenderer.camera.zoom = viewport.width * devicePixelRatio / viewportSize.x * this.config.settingsScale; + this.sceneRenderer.camera.zoom = viewport.width * devicePixelRatio / viewportSize.x * this.getOperatorScale(); this.sceneRenderer.camera.position.x = viewport.x + viewport.width / 2; this.sceneRenderer.camera.position.y = viewport.y + viewport.height / 2; this.sceneRenderer.begin();