chizui/aklive2d
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(wallpaper engine): fixed an issue on position loading

Browse Source
This commit is contained in:
Halyul
2021-06-03 23:03:18 -04:00
parent f72ae1001c
commit fd7d76cb0c
3 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
template/assets/runner.js
View File

@@ -37,7 +37,7 @@ if (!supportsWebGL()) {
fallback(); fallback();
} else { } else {
var e = document.getElementById("container"); var e = document.getElementById("container");
var settings;
var spinePlayer = new spine.SpinePlayer(e, { var spinePlayer = new spine.SpinePlayer(e, {
jsonUrl: window.operatorSettings.jsonUrl, jsonUrl: window.operatorSettings.jsonUrl,
skelUrl: window.operatorSettings.skelUrl, skelUrl: window.operatorSettings.skelUrl,
@@ -51,9 +51,13 @@ if (!supportsWebGL()) {
showControls: false, showControls: false,
fps: window.operatorSettings.fps, fps: window.operatorSettings.fps,
defaultMix: window.operatorSettings.defaultMix, defaultMix: window.operatorSettings.defaultMix,
success: window.operatorSettings.success, success: function (e) {
window.operatorSettings.success(e);
settings.spinePlayerLoaded = true;
settings.loadViewport();
},
}); });
var settings = new Settings({ settings = new Settings({
logo: document.getElementById("logo"), logo: document.getElementById("logo"),
spinePlayer: spinePlayer, spinePlayer: spinePlayer,
operatorSettings: window.operatorSettings operatorSettings: window.operatorSettings

11
template/assets/settings.js
View File

@@ -12,7 +12,7 @@ var Settings = (function () {
this.logoSrc = this.logoEl.src; this.logoSrc = this.logoEl.src;
this.opacity = parseFloat(getComputedStyle(this.logoEl).opacity) * 100; this.opacity = parseFloat(getComputedStyle(this.logoEl).opacity) * 100;
this.el = document.createElement("div"); this.el = document.createElement("div");
this.spinePlayerLoaded = false;
} }
Settings.prototype.validateConfig = function () { Settings.prototype.validateConfig = function () {
if (typeof this.logoEl === "string") if (typeof this.logoEl === "string")
@@ -64,7 +64,8 @@ var Settings = (function () {
this.logoEl.style.opacity = opacity / 100; this.logoEl.style.opacity = opacity / 100;
}; };
Settings.prototype.positionReset = function () { Settings.prototype.positionReset = function () {
this.spinePlayer.updateViewport(window.operatorSettings.viewport) if (this.spinePlayerLoaded)
this.spinePlayer.updateViewport(window.operatorSettings.viewport)
}; };
Settings.prototype.positionPadding = function (key, value) { Settings.prototype.positionPadding = function (key, value) {
switch (key) { switch (key) {
@@ -81,7 +82,11 @@ var Settings = (function () {
this.viewport.padBottom = `${value}%`; this.viewport.padBottom = `${value}%`;
break; break;
} }
this.spinePlayer.updateViewport(this.viewport) this.loadViewport();
};
Settings.prototype.loadViewport = function () {
if (this.spinePlayerLoaded)
this.spinePlayer.updateViewport(this.viewport);
}; };
Settings.prototype.open = function () { Settings.prototype.open = function () {
this.el.classList.add("website-settings"); this.el.classList.add("website-settings");

14
template/assets/spine-player.js
View File

@@ -11318,14 +11318,12 @@ var spine;
this.time.setFps(value); this.time.setFps(value);
}; };
SpinePlayer.prototype.updateViewport = function (viewport) { SpinePlayer.prototype.updateViewport = function (viewport) {
if (this.loaded) { var _currentViewport = this.currentViewport;
var _currentViewport = this.currentViewport; _currentViewport.padLeft = this.percentageToWorldUnit(_currentViewport.width, viewport.padLeft);
_currentViewport.padLeft = this.percentageToWorldUnit(_currentViewport.width, viewport.padLeft); _currentViewport.padRight = this.percentageToWorldUnit(_currentViewport.width, viewport.padRight);
_currentViewport.padRight = this.percentageToWorldUnit(_currentViewport.width, viewport.padRight); _currentViewport.padBottom = this.percentageToWorldUnit(_currentViewport.height, viewport.padBottom);
_currentViewport.padBottom = this.percentageToWorldUnit(_currentViewport.height, viewport.padBottom); _currentViewport.padTop = this.percentageToWorldUnit(_currentViewport.height, viewport.padTop);
_currentViewport.padTop = this.percentageToWorldUnit(_currentViewport.height, viewport.padTop); this.currentViewport = _currentViewport;
this.currentViewport = _currentViewport;
}
}; };
SpinePlayer.HOVER_COLOR_INNER = new spine.Color(0.478, 0, 0, 0.25); SpinePlayer.HOVER_COLOR_INNER = new spine.Color(0.478, 0, 0, 0.25);
SpinePlayer.HOVER_COLOR_OUTER = new spine.Color(1, 1, 1, 1); SpinePlayer.HOVER_COLOR_OUTER = new spine.Color(1, 1, 1, 1);