From ed4e9aa689271a161f3868aeb348f50374b42afc Mon Sep 17 00:00:00 2001 From: timohueser Date: Sat, 21 Nov 2026 22:45:33 +0100 Subject: [PATCH 1/2] trailview: an idle view waits for the meshes that count their calm frames Co-Authored-By: Claude Opus 5.5 --- builder/web/src/lib/trailview/terrain/terrain.test.ts | 6 ++++++ builder/web/src/lib/trailview/terrain/terrain.ts | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/builder/web/src/lib/trailview/terrain/terrain.test.ts b/builder/web/src/lib/trailview/terrain/terrain.test.ts index a4163a8ccd..62d6f4be3e 100644 --- a/builder/web/src/lib/trailview/terrain/terrain.test.ts +++ b/builder/web/src/lib/trailview/terrain/terrain.test.ts @@ -74,6 +74,12 @@ describe('the frames of a still view', () => { expect(working(0)).toBe(true); expect(working(1)).toBe(false); }); + + it('end in an idle view only once the meshes that count their calm frames draw', () => { + const idle = (returning: boolean) => Object.assign(Object.create(Terrain.prototype), { pages: { idle: true }, calm: 1, probing: 0, pieces: { returning } }).idle; + expect(idle(true)).toBe(false); + expect(idle(false)).toBe(true); + }); }); describe('the attach to a device', () => { diff --git a/builder/web/src/lib/trailview/terrain/terrain.ts b/builder/web/src/lib/trailview/terrain/terrain.ts index fcfed34f89..0a0e7e394f 100644 --- a/builder/web/src/lib/trailview/terrain/terrain.ts +++ b/builder/web/src/lib/trailview/terrain/terrain.ts @@ -297,8 +297,9 @@ export class Terrain { this.pages = new Pages(source, { stored: Math.round(budget.terrainShare * (pages - SYNTH_PAGES)), synth: Math.round(budget.terrainShare * SYNTH_PAGES) }, this.bounds, changed, stamps, MASKS, budget); } + /** No page loads, and the meshes draw if they will: they count CALM frames from a load's start, 4 s at 30 fps. */ get idle(): boolean { - return this.pages.idle && this.calm > 0 && this.probing === 0; + return this.pages.idle && this.calm > 0 && this.probing === 0 && !this.pieces?.returning; } /** The feature tiles and road meshes that failed. */ From 171af0d3714722d1f6d4e37492e66020c973b073 Mon Sep 17 00:00:00 2001 From: timohueser Date: Sat, 21 Nov 2026 22:49:08 +0100 Subject: [PATCH 2/2] trailview: review fixes of the idle meshes Co-Authored-By: Claude Opus 5.5 --- builder/web/src/lib/trailview/terrain/terrain.test.ts | 6 ------ builder/web/src/lib/trailview/terrain/terrain.ts | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/builder/web/src/lib/trailview/terrain/terrain.test.ts b/builder/web/src/lib/trailview/terrain/terrain.test.ts index 62d6f4be3e..a4163a8ccd 100644 --- a/builder/web/src/lib/trailview/terrain/terrain.test.ts +++ b/builder/web/src/lib/trailview/terrain/terrain.test.ts @@ -74,12 +74,6 @@ describe('the frames of a still view', () => { expect(working(0)).toBe(true); expect(working(1)).toBe(false); }); - - it('end in an idle view only once the meshes that count their calm frames draw', () => { - const idle = (returning: boolean) => Object.assign(Object.create(Terrain.prototype), { pages: { idle: true }, calm: 1, probing: 0, pieces: { returning } }).idle; - expect(idle(true)).toBe(false); - expect(idle(false)).toBe(true); - }); }); describe('the attach to a device', () => { diff --git a/builder/web/src/lib/trailview/terrain/terrain.ts b/builder/web/src/lib/trailview/terrain/terrain.ts index 0a0e7e394f..2d5ba66505 100644 --- a/builder/web/src/lib/trailview/terrain/terrain.ts +++ b/builder/web/src/lib/trailview/terrain/terrain.ts @@ -297,7 +297,7 @@ export class Terrain { this.pages = new Pages(source, { stored: Math.round(budget.terrainShare * (pages - SYNTH_PAGES)), synth: Math.round(budget.terrainShare * SYNTH_PAGES) }, this.bounds, changed, stamps, MASKS, budget); } - /** No page loads, and the meshes draw if they will: they count CALM frames from a load's start, 4 s at 30 fps. */ + /** No page loads, and the meshes are not waiting out the CALM frames that follow a rest (`Pieces.returning`). */ get idle(): boolean { return this.pages.idle && this.calm > 0 && this.probing === 0 && !this.pieces?.returning; }