UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 09:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ts][player] Closes #1238, disable pause/play when controls are hidden via options.

Browse Source
This commit is contained in:
badlogic 2019-01-03 13:43:23 +01:00
parent 66689b3800
commit 1cf8a72e30
6 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-ts/build/spine-all.js
View File

@ -10820,6 +10820,8 @@ var spine;
target = null; target = null;
} }
else { else {
if (!_this.config.showControls)
return;
if (_this.paused) if (_this.paused)
_this.play(); _this.play();
else else

2
spine-ts/build/spine-all.js.map
View File

File diff suppressed because one or more lines are too long

2
spine-ts/build/spine-player.js
View File

@ -10157,6 +10157,8 @@ var spine;
target = null; target = null;
} }
else { else {
if (!_this.config.showControls)
return;
if (_this.paused) if (_this.paused)
_this.play(); _this.play();
else else

2
spine-ts/build/spine-player.js.map
View File

File diff suppressed because one or more lines are too long

3
spine-ts/player/example/index.html
View File

@ -29,7 +29,8 @@ body {
backgroundColor: "#cccccc", backgroundColor: "#cccccc",
viewport: { viewport: {
debugRender: true, debugRender: true,
} },
showControls: false,
}); });
/*// Creates a new spine player with a transparent background, /*// Creates a new spine player with a transparent background,

33
spine-ts/player/src/Player.ts
View File

@ -989,6 +989,7 @@
if (target) { if (target) {
target = null; target = null;
} else { } else {
if (!this.config.showControls) return;
if (this.paused) if (this.paused)
this.play() this.play()
else else
@ -1048,22 +1049,22 @@
let handleHover = (mouseX: number, mouseY: number) => { let handleHover = (mouseX: number, mouseY: number) => {
if (!this.config.showControls) return; if (!this.config.showControls) return;
let popup = findWithClass(this.dom, "spine-player-popup"); let popup = findWithClass(this.dom, "spine-player-popup");
mouseOverControls = overlap(mouseX, mouseY, this.playerControls.getBoundingClientRect()); mouseOverControls = overlap(mouseX, mouseY, this.playerControls.getBoundingClientRect());
mouseOverCanvas = overlap(mouseX, mouseY, this.canvas.getBoundingClientRect()); mouseOverCanvas = overlap(mouseX, mouseY, this.canvas.getBoundingClientRect());
clearTimeout(this.cancelId); clearTimeout(this.cancelId);
let hide = popup.length == 0 && !mouseOverControls && !mouseOverCanvas && !this.paused; let hide = popup.length == 0 && !mouseOverControls && !mouseOverCanvas && !this.paused;
if (hide) { if (hide) {
this.playerControls.classList.add("spine-player-controls-hidden"); this.playerControls.classList.add("spine-player-controls-hidden");
} else { } else {
this.playerControls.classList.remove("spine-player-controls-hidden"); this.playerControls.classList.remove("spine-player-controls-hidden");
} }
if (!mouseOverControls && popup.length == 0 && !this.paused) { if (!mouseOverControls && popup.length == 0 && !this.paused) {
let remove = () => { let remove = () => {
if (!this.paused) this.playerControls.classList.add("spine-player-controls-hidden"); if (!this.paused) this.playerControls.classList.add("spine-player-controls-hidden");
}; };
this.cancelId = setTimeout(remove, 1000); this.cancelId = setTimeout(remove, 1000);
} }
} }
let overlap = (mouseX: number, mouseY: number, rect: DOMRect | ClientRect): boolean => { let overlap = (mouseX: number, mouseY: number, rect: DOMRect | ClientRect): boolean => {