mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 08:12:24 +00:00
Read conformance pixels where they are drawn, and skip them only by the harness
Checks that read drawn pixels no longer skip when nothing is drawn: a harness says pixels: false when its renderer draws only models into pixels, as the stub, and a renderer that draws an icon, an outlined line or a raster shell as nothing fails. The shell's patch is read where the ground below projects, in the units readPixels crops in. The contract notes what changed in version 0 besides additions, and loses two stale lines.
This commit is contained in:
1 parent
d5e3968caa
commit
f1817756ed
4 files changed
+38
-36
No files matched your search
@@ -37,6 +37,14 @@ exposes nine ports, each typed in its own file in `src/render/contract/`:
|
|||||||
| `credits` | `credits.d.ts` | Data credits owed |
|
| `credits` | `credits.d.ts` | Data credits owed |
|
||||||
| `quality` | `quality.d.ts` | Quality knobs, device facts, frame signals |
|
| `quality` | `quality.d.ts` | Quality knobs, device facts, frame signals |
|
||||||
|
|
||||||
|
Version `0` is still being shaped, and not only by additions. Members
|
||||||
|
were removed or replaced (among them `camera.move`, `look`,
|
||||||
|
`rotateAround` and `zoom`, now step views placed with `setView`;
|
||||||
|
`query.sampleHeightNowMany`; `input.ctrlWheelZoom`, now the `ctrlWheel`
|
||||||
|
zoom input), `depthFailColor` and `depthFailDash` became one `depthFail`
|
||||||
|
style, and quality settings became detail only. A renderer written against
|
||||||
|
an earlier `0` follows those changes.
|
||||||
|
|
||||||
Some members and options were added to version `0` later. Each is
|
Some members and options were added to version `0` later. Each is
|
||||||
optional, so a renderer written before it still conforms:
|
optional, so a renderer written before it still conforms:
|
||||||
|
|
||||||
@@ -66,10 +74,11 @@ optional, so a renderer written before it still conforms:
|
|||||||
says once per spec or `update` that it is drawn, never while hidden. These
|
says once per spec or `update` that it is drawn, never while hidden. These
|
||||||
change `fields` itself rather than add to it, so the renderer follows
|
change `fields` itself rather than add to it, so the renderer follows
|
||||||
`fields` before must follow them. The Cesium adapter lists `fields` and
|
`fields` before must follow them. The Cesium adapter lists `fields` and
|
||||||
draws `rasterShell` and `windStreamlines`. It draws streamlines only over the whole globe: it reads the grid's samples
|
draws `rasterShell` and `windStreamlines`. It draws streamlines only over
|
||||||
as points, the first column at `rectangle.west` and the first row at
|
the whole globe: it reads the grid's samples as points, the first column
|
||||||
`rectangle.north`, rows running south, and traces paths that wrap east
|
at `rectangle.west` and the first row at `rectangle.north`, rows running
|
||||||
and west, so it refuses a grid short of 360° of longitude.
|
south, and traces paths that wrap east and west, so it refuses a grid
|
||||||
|
short of 360° of longitude.
|
||||||
- `ModulationSector` gains `radius` and `floor` and says what it modulates:
|
- `ModulationSector` gains `radius` and `floor` and says what it modulates:
|
||||||
icons, points and models dimmed toward `floor` outside the band, the map,
|
icons, points and models dimmed toward `floor` outside the band, the map,
|
||||||
lines and shapes as they are, picks unchanged. Its pass is named
|
lines and shapes as they are, picks unchanged. Its pass is named
|
||||||
@@ -86,8 +95,8 @@ optional, so a renderer written before it still conforms:
|
|||||||
is 2 px of outline, 4 px of colour and 2 px of outline, as Cesium draws
|
is 2 px of outline, 4 px of colour and 2 px of outline, as Cesium draws
|
||||||
it. The check `draw.lines.outline` pins it.
|
it. The check `draw.lines.outline` pins it.
|
||||||
- A shape's `lit` chooses shading by the renderer's fixed light (true) or a
|
- A shape's `lit` chooses shading by the renderer's fixed light (true) or a
|
||||||
flat colour (false); omitted, extruded shapes and boxes are lit and the
|
flat colour (false); omitted, extruded shapes are lit and the rest flat,
|
||||||
rest flat, as before. The Cesium port lights unclamped shapes only
|
as before. The Cesium port lights unclamped shapes only
|
||||||
(clamped ones drape unlit). The `shapes-lit` scene draws both.
|
(clamped ones drape unlit). The `shapes-lit` scene draws both.
|
||||||
- `SetSpec.drawOrder` stacks sets drawn over depth: a higher one draws over
|
- `SetSpec.drawOrder` stacks sets drawn over depth: a higher one draws over
|
||||||
a lower one and is picked first; equal ones keep the order they were
|
a lower one and is picked first; equal ones keep the order they were
|
||||||
@@ -225,7 +234,10 @@ renderer under test:
|
|||||||
Optional members widen what is checked: `pointer` for synthetic input,
|
Optional members widen what is checked: `pointer` for synthetic input,
|
||||||
`cameraInput` (the camera answers that input: the drag and wheel traces
|
`cameraInput` (the camera answers that input: the drag and wheel traces
|
||||||
run), `scriptHeights`, `assets.model`, and `assets.missingModel` (a model
|
run), `scriptHeights`, `assets.model`, and `assets.missingModel` (a model
|
||||||
url that fails to load, for the `loadFailed` check).
|
url that fails to load, for the `loadFailed` check). `pixels: false` says
|
||||||
|
the renderer draws nothing but models into its pixels, as the stub: the
|
||||||
|
checks that read drawn icons, lines and fields then skip. Without it they
|
||||||
|
run, and the renderer fails them if it draws nothing there.
|
||||||
|
|
||||||
There are two layers of checks.
|
There are two layers of checks.
|
||||||
|
|
||||||
|
|||||||
@@ -727,15 +727,17 @@ export function portChecks() {
|
|||||||
"a shell draws its image, and its 'drawn' comes once per change, never while hidden",
|
"a shell draws its image, and its 'drawn' comes once per change, never while hidden",
|
||||||
async (h, r) => {
|
async (h, r) => {
|
||||||
await overAustin(h, r, 20000);
|
await overAustin(h, r, 20000);
|
||||||
// The middle of the frame, which the shell below covers whole.
|
// Around Austin, below the eye, which the shell covers whole; where
|
||||||
|
// it projects is in the units `readPixels` crops in.
|
||||||
|
const below = r.query.project(h.toEcef({ ...AUSTIN, height: 0 }));
|
||||||
|
ok(below, 'the ground below projects');
|
||||||
const middle = async () => {
|
const middle = async () => {
|
||||||
await settled(r);
|
await settled(r);
|
||||||
r.frame.renderNow();
|
r.frame.renderNow();
|
||||||
const { width, height } = r.canvas;
|
|
||||||
return r.readPixels({
|
return r.readPixels({
|
||||||
crop: {
|
crop: {
|
||||||
x: Math.round(width / 2) - 6,
|
x: Math.round(below.x) - 6,
|
||||||
y: Math.round(height / 2) - 6,
|
y: Math.round(below.y) - 6,
|
||||||
width: 13,
|
width: 13,
|
||||||
height: 13,
|
height: 13,
|
||||||
},
|
},
|
||||||
@@ -748,25 +750,8 @@ export function portChecks() {
|
|||||||
if (now[i + 2] - was[i + 2] > 40 && now[i] - was[i] < 20) n++;
|
if (now[i + 2] - was[i + 2] > 40 && now[i] - was[i] < 20) n++;
|
||||||
return n;
|
return n;
|
||||||
};
|
};
|
||||||
const empty = await middle();
|
const readsPixels = h.pixels !== false;
|
||||||
// A renderer that draws lines into pixels must draw the shell too;
|
const empty = readsPixels ? await middle() : null;
|
||||||
// one that draws neither (the stub) leaves the pixels unread.
|
|
||||||
const probe = r.draw.lines({ id: 'conf:shell-probe' });
|
|
||||||
const at = (dLon) =>
|
|
||||||
h.toEcef({ lon: AUSTIN.lon + dLon, lat: AUSTIN.lat, height: 0 });
|
|
||||||
probe.set([
|
|
||||||
{
|
|
||||||
id: 'l',
|
|
||||||
positions: [at(-0.02), at(0.02)],
|
|
||||||
widthPx: 20,
|
|
||||||
mode: '3d',
|
|
||||||
style: { kind: 'solid', color: '#0000ff' },
|
|
||||||
},
|
|
||||||
]);
|
|
||||||
await drawn(h, r);
|
|
||||||
const drawsPixels = bluer(await middle(), empty) >= 20;
|
|
||||||
probe.dispose();
|
|
||||||
await drawn(h, r);
|
|
||||||
const svg = (fill) => ({
|
const svg = (fill) => ({
|
||||||
svg: `<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8"><rect width="8" height="8" fill="${fill}"/></svg>`,
|
svg: `<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8"><rect width="8" height="8" fill="${fill}"/></svg>`,
|
||||||
});
|
});
|
||||||
@@ -791,7 +776,7 @@ export function portChecks() {
|
|||||||
try {
|
try {
|
||||||
await until(1);
|
await until(1);
|
||||||
equal(drawnCount, 1, 'drawn once made');
|
equal(drawnCount, 1, 'drawn once made');
|
||||||
if (drawsPixels)
|
if (readsPixels)
|
||||||
ok(
|
ok(
|
||||||
bluer(await middle(), empty) >= 150,
|
bluer(await middle(), empty) >= 150,
|
||||||
'the shell draws its image over the frame',
|
'the shell draws its image over the frame',
|
||||||
@@ -1118,8 +1103,9 @@ export function portChecks() {
|
|||||||
set.set([]);
|
set.set([]);
|
||||||
const empty = await patch();
|
const empty = await patch();
|
||||||
const drawnPixels = differ(shown, empty);
|
const drawnPixels = differ(shown, empty);
|
||||||
if (drawnPixels < 20)
|
if (h.pixels === false)
|
||||||
return { skip: 'this renderer draws no icon pixels' };
|
return { skip: 'this harness reads no drawn pixels' };
|
||||||
|
ok(drawnPixels >= 20, 'the icon draws into pixels');
|
||||||
set.set([icon]);
|
set.set([icon]);
|
||||||
r.effects.screenModulation(sector());
|
r.effects.screenModulation(sector());
|
||||||
ok(
|
ok(
|
||||||
@@ -2099,8 +2085,8 @@ export function portChecks() {
|
|||||||
: '-';
|
: '-';
|
||||||
}
|
}
|
||||||
lines.dispose();
|
lines.dispose();
|
||||||
if (!column.includes('g') && !column.includes('r'))
|
if (h.pixels === false)
|
||||||
return { skip: 'this renderer draws no line pixels' };
|
return { skip: 'this harness reads no drawn pixels' };
|
||||||
const runs = column.match(/r+|g+/g) ?? [];
|
const runs = column.match(/r+|g+/g) ?? [];
|
||||||
const sides = runs.filter((run) => run[0] === 'r');
|
const sides = runs.filter((run) => run[0] === 'r');
|
||||||
const core = runs.find((run) => run[0] === 'g') ?? '';
|
const core = runs.find((run) => run[0] === 'g') ?? '';
|
||||||
|
|||||||
@@ -21,7 +21,8 @@
|
|||||||
* Optional harness members widen what is checked: `pointer(r, type, x, y)`
|
* Optional harness members widen what is checked: `pointer(r, type, x, y)`
|
||||||
* (synthetic input; with `cameraInput`, the camera scripts' drags and
|
* (synthetic input; with `cameraInput`, the camera scripts' drags and
|
||||||
* wheels too), `scriptHeights(r, fn)` (heights from a function),
|
* wheels too), `scriptHeights(r, fn)` (heights from a function),
|
||||||
* `wallTime(r)` (the wall clock a `live` motion clock reads),
|
* `wallTime(r)` (the wall clock a `live` motion clock reads), `pixels`
|
||||||
|
* (false skips the checks that read drawn pixels),
|
||||||
* `assets.model` (a glTF URL). `create` may return null when it cannot
|
* `assets.model` (a glTF URL). `create` may return null when it cannot
|
||||||
* make a renderer with fewer capabilities; those checks are then skipped.
|
* make a renderer with fewer capabilities; those checks are then skipped.
|
||||||
*/
|
*/
|
||||||
@@ -50,6 +51,7 @@ import { portChecks } from './checks/ports.js';
|
|||||||
* A move's `x, y` is where it started and `extra.endPosition` where it
|
* A move's `x, y` is where it started and `extra.endPosition` where it
|
||||||
* went; `extra` also has `button` (a move's the one held), `modifiers`
|
* went; `extra` also has `button` (a move's the one held), `modifiers`
|
||||||
* and, for a wheel, `delta` in the input port's lines.
|
* and, for a wheel, `delta` in the input port's lines.
|
||||||
|
* @property {boolean} [pixels] False when the renderer draws nothing but models into its pixels (the stub): the checks that read drawn icons, lines and fields are then skipped. Otherwise they run, and an empty draw fails them.
|
||||||
* @property {boolean} [cameraInput] The renderer's camera moves on pointer input sent through `pointer` (its own gestures, or a camera controller's): the camera scripts with `input` steps run.
|
* @property {boolean} [cameraInput] The renderer's camera moves on pointer input sent through `pointer` (its own gestures, or a camera controller's): the camera scripts with `input` steps run.
|
||||||
* @property {(r: object, fn: (point: {lon: number, lat: number}, against?: string) => number|null) => void} [scriptHeights]
|
* @property {(r: object, fn: (point: {lon: number, lat: number}, against?: string) => number|null) => void} [scriptHeights]
|
||||||
* @property {(r: object) => number} [wallTime] Epoch ms the renderer's `live` motion clock reads.
|
* @property {(r: object) => number} [wallTime] Epoch ms the renderer's `live` motion clock reads.
|
||||||
|
|||||||
@@ -20,6 +20,8 @@ export function createStubHarness(name = 'stub') {
|
|||||||
toEcef,
|
toEcef,
|
||||||
tolerance: DEFAULT_TOLERANCE,
|
tolerance: DEFAULT_TOLERANCE,
|
||||||
flightPaths: 'trace',
|
flightPaths: 'trace',
|
||||||
|
// It draws only models into pixels.
|
||||||
|
pixels: false,
|
||||||
pointer: (r, type, x, y, extra) => r.testing.pointer(type, x, y, extra),
|
pointer: (r, type, x, y, extra) => r.testing.pointer(type, x, y, extra),
|
||||||
scriptHeights: (r, fn) => r.testing.setHeights(fn),
|
scriptHeights: (r, fn) => r.testing.setHeights(fn),
|
||||||
wallTime: (r) => r.testing.wallTime(),
|
wallTime: (r) => r.testing.wallTime(),
|
||||||
|
|||||||
Reference in new issue
Block a user