On a screen scaled to 125 % or 150 % the editor looked soft beside a page the browser draws itself. The layout counts in whole CSS pixels, and most of those fall between two device pixels there. The GPU averages both: text loses its edges, and a 1 px line becomes a pixel and a half of mixed colour. Now text and boxes are rounded to device pixels, and a line is one device pixel wide. - ui/pixelGrid.ts holds the rule. crispText() makes a text with Pixi's roundPixels, crisp() does the same for a Graphics of upright boxes, and hairline() is the width of one device pixel. - Every text of the interface is made with crispText() instead of new Text(). - crisp() only rounds where the scale is not a whole number. At 100 % and 200 % nothing changes. - drawControlBox, drawHeaderBar and drawSectionBand draw their lines a hairline wide and flush with the edge. The widgets that draw lines of their own do the same. - Two bands share exactly the line they draw, and a column still ends on a whole pixel. - The stage is nudged by 1/32 px where the scale is not whole. At 150 % every odd pixel is an exact half, and without the nudge one band came out a row shorter than its neighbours. - Curves, icons and everything of the game stay unrounded. Rounding their points would bend them. - The harness takes deviceScaleFactor as an option, and the hooks deviceColumn, edgeContrast and pixelGrid read the frame as the screen gets it. Not in here: the subpixel smoothing a browser gives its own text. Pixi draws a text into a transparent picture first, and there only greyscale smoothing is possible. Measured at 150 %, edge contrast before and after: top bar 31.5 to 47.8, the lists on the left 68.6 to 86.4, inspector 27.6 to 38.4. At 100 % it is 46.5, 90.1 and 37.9, and the picture there is the same as before pixel for pixel, apart from the fps display. Tests: - Gate on melektaus-atx: 206 files, 3114 tests (3104 + 10), exit 0 - Full run on melektaus-atx: 1655 of 1656 checks passed, smokes 24/19/21. The one that failed was a condition of the new step 62 itself: it scrolled an inspector that had nothing to scroll. The step now makes the window lower for that reading. - e2e 61,62 after that fix: 14 checks. The full run was not repeated, and CI is switched off for now. - Ten unit tests, nine in tests/ui/pixel-grid.test.ts - Eight e2e checks in the new step 62, which runs at 150 % - Eleven unit counter-probes fail tests - Four browser counter-probes fail their checks. They ran before the fix to step 62 and were not repeated for it. - Screenshots looked at for 125 % and 150 % Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
118 lines
4.7 KiB
TypeScript
118 lines
4.7 KiB
TypeScript
import { Container, Graphics, Texture } from 'pixi.js';
|
||
import type { ParticlesAsset } from '../../core/model/Asset';
|
||
import { translation } from '../../core/model/matrix';
|
||
import type { PropertyBag } from '../../core/model/Properties';
|
||
import { resolveTexture } from '../../core/model/texture';
|
||
import { defaultsFor } from '../../core/properties/PropertySchema';
|
||
import { SHEET_EDGE } from '../../core/shader/nodes';
|
||
import { crisp, hairline, type Size, Theme, Widget } from '../../ui';
|
||
import { ParticleField } from '../../viewport/particles';
|
||
import { particleLibrary } from '../../viewport/ParticleLibrary';
|
||
import { shaderLibrary } from '../../viewport/ShaderLibrary';
|
||
import { textureLibrary } from '../../viewport/TextureLibrary';
|
||
import type { EditorState } from '../state';
|
||
|
||
const MIN_HEIGHT = 40;
|
||
|
||
/**
|
||
* The asset's own particles, emitted from the middle of the panel by a source that wears the asset's
|
||
* own rows. It is the one place a formula graph can be judged: the numbers say nothing. What it is
|
||
* not is an instance – a source placed in a scene may override every one of those rows, and the tab
|
||
* has no way to know which of them is meant.
|
||
*/
|
||
export class ParticlePreview extends Widget {
|
||
private readonly bg = crisp(new Graphics());
|
||
private readonly content = new Container();
|
||
private readonly clip = new Graphics();
|
||
private readonly field = new ParticleField();
|
||
private asset: ParticlesAsset | null = null;
|
||
/** Null: the preview runs on the library clock. A number: it stands at that second. */
|
||
private held: number | null = null;
|
||
|
||
constructor(private readonly state: EditorState) {
|
||
super();
|
||
this.minHeight = MIN_HEIGHT;
|
||
this.content.addChild(this.field.container);
|
||
this.content.mask = this.clip;
|
||
this.addChild(this.bg, this.content, this.clip);
|
||
}
|
||
|
||
override measure(): Size {
|
||
return { w: Math.max(this.minWidth, 100), h: Math.max(this.minHeight, MIN_HEIGHT) };
|
||
}
|
||
|
||
show(asset: ParticlesAsset | null): void {
|
||
this.asset = asset;
|
||
this.invalidate();
|
||
}
|
||
|
||
/** Seconds the shown source has been emitting, whether held or running. */
|
||
get time(): number {
|
||
return this.held ?? Math.max(0, this.field.elapsed(particleLibrary.now()));
|
||
}
|
||
|
||
get holding(): boolean {
|
||
return this.held !== null;
|
||
}
|
||
|
||
hold(at: number | null): void {
|
||
// Letting go has to move the origin, not just stop faking one: the library clock keeps counting
|
||
// under a freeze, so the panel would otherwise resume at the second it would have reached.
|
||
if (at === null && this.held !== null) this.field.rebase(particleLibrary.now(), this.held);
|
||
this.held = at;
|
||
this.invalidate();
|
||
}
|
||
|
||
/** Back to second 0 – a held panel stands there too, rather than keeping the second it was on. */
|
||
restart(): void {
|
||
this.field.restart(particleLibrary.now());
|
||
if (this.held !== null) this.held = 0;
|
||
this.invalidate();
|
||
}
|
||
|
||
/** How many particles the preview is drawing – what the checks read. */
|
||
get count(): number {
|
||
return this.field.count;
|
||
}
|
||
|
||
override redraw(): void {
|
||
const c = Theme.colors;
|
||
// A ground of its own and a rule along the top: on the graph's own background the strip was
|
||
// invisible as a thing, and a particle standing still read as a node that had lost its box.
|
||
this.bg.clear().rect(0, 0, this.w, this.h).fill(c.panel);
|
||
this.bg.rect(0, 0, this.w, hairline()).fill(c.border);
|
||
this.clip.clear().rect(0, 0, this.w, this.h).fill(0xffffff);
|
||
this.field.container.visible = this.asset !== null;
|
||
if (!this.asset) return;
|
||
const build = particleLibrary.buildFor(this.asset);
|
||
const rows = build.compiled?.params ?? [];
|
||
const props = previewProps(this.asset, rows);
|
||
const params = rows.map((row) => Number(props[row.key] ?? row.default));
|
||
const ref = resolveTexture(this.state.project, props);
|
||
const texture = ref ? textureLibrary.get(ref, SHEET_EDGE) : null;
|
||
// The source sits in the middle of the panel; a fountain then has room above and below it.
|
||
const m = translation(this.w / 2, this.h / 2);
|
||
this.field.hold(this.held);
|
||
this.field.wear(props, shaderLibrary.source(this.state.project));
|
||
this.field.sync(build.compiled, props, params, m, texture ?? Texture.WHITE, particleLibrary.now());
|
||
}
|
||
|
||
override destroy(): void {
|
||
this.field.destroy();
|
||
super.destroy();
|
||
}
|
||
}
|
||
|
||
/**
|
||
* A source as the asset alone describes it: the rows the asset carries, over the type's defaults for
|
||
* the ones it does not, with the graph's own parameters at their declared defaults underneath.
|
||
*/
|
||
function previewProps(
|
||
asset: ParticlesAsset,
|
||
params: readonly { key: string; default: number }[],
|
||
): PropertyBag {
|
||
const props = defaultsFor('particles');
|
||
for (const row of params) props[row.key] = row.default;
|
||
return { ...props, ...asset.props };
|
||
}
|