Skip to content

Fix idling #590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: feature/rtl
Choose a base branch
from
Open

Fix idling #590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 30 additions & 33 deletions src/platforms/browser/WebPlatform.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ export default class WebPlatform {
// Alternative handler to avoid RAF when idle
this._loopHandler = null;
this._idleLoopCounter = 0;
this._idleLoopDelay = 60;
this._onIdle = false;
this._idleLoopDelay = 30;

if (this.stage.getOption("useImageWorker")) {
if (!window.createImageBitmap || !window.Worker) {
Expand All @@ -52,6 +51,7 @@ export default class WebPlatform {
this._imageWorker.destroy();
}

this._looping = false;
clearInterval(this._loopHandler);

this._removeKeyHandler();
Expand All @@ -75,44 +75,41 @@ export default class WebPlatform {
this._looping = false;
}

switchLoop() {
if (this._onIdle === false) {
this._onIdle = true;
this.stage.onIdle();
}

if (this._idleLoopCounter < this._idleLoopDelay) {
this._idleLoopCounter++;
return;
}
if (!this.stage.ctx.hasRenderUpdates()) {
this.stopLoop();
this._loopHandler = setInterval(() => {
this.stage.updateFrame();
this.stage.idleFrame();
if (this.stage.ctx.hasRenderUpdates()) {
clearInterval(this._loopHandler);
this.startLoop();
};
}, 1000 / 60);
} else {
switchLoop(hasChanges) {
if (hasChanges) {
this._idleLoopCounter = 0;
return false;
}
if (++this._idleLoopCounter < this._idleLoopDelay) {
return false;
}

this.stopLoop();
this._loopHandler = setInterval(() => {
this.stage.updateFrame();
const hasChanges = this.stage.renderFrame();
if (hasChanges) {
clearInterval(this._loopHandler);
this.startLoop();
}
}, 1000 / 30);

this.stage.onIdle();
return true;
}

loop() {
let self = this;
let lp = function () {
self._awaitingLoop = false;
self._onIdle = false;
if (self._looping) {
self.stage.updateFrame();
if (self.stage.getOption("pauseRafLoopOnIdle")) {
self.switchLoop();
const pauseRafLoopOnIdle = this.stage.getOption("pauseRafLoopOnIdle");
const lp = () => {
this._awaitingLoop = false;
if (this._looping) {
this.stage.updateFrame();
const hasChanges = this.stage.renderFrame();
if (pauseRafLoopOnIdle && this.switchLoop(hasChanges)) {
return;
}
self.stage.renderFrame();
requestAnimationFrame(lp);
self._awaitingLoop = true;
this._awaitingLoop = true;
}
}
requestAnimationFrame(lp);
Expand Down
2 changes: 1 addition & 1 deletion src/tree/Stage.d.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ declare class Stage extends EventEmitter<Stage.EventMap> {
*/
isUpdatingFrame(): boolean;

// renderFrame(): void;
// renderFrame(): boolean;
// - Only used internally

/**
Expand Down
12 changes: 4 additions & 8 deletions src/tree/Stage.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ export default class Stage extends EventEmitter {
_setOptions(o) {
this._options = {};

let opt = (name, def) => {
const opt = (name, def) => {
let value = o[name];

if (value === undefined) {
Expand Down Expand Up @@ -315,7 +315,7 @@ export default class Stage extends EventEmitter {
this._updateSourceTextures.forEach(texture => {
texture._performUpdateSource();
});
this._updateSourceTextures = new Set();
this._updateSourceTextures.clear();
}
}

Expand All @@ -337,12 +337,6 @@ export default class Stage extends EventEmitter {
this.emit('update');
}

idleFrame() {
this.textureThrottler.processSome();
this.emit('frameEnd');
this.frameCounter++;
}

onIdle() {
this.emit('idle');
}
Expand All @@ -366,6 +360,8 @@ export default class Stage extends EventEmitter {
this.emit('frameEnd');

this.frameCounter++;

return changes;
}

isUpdatingFrame() {
Expand Down