mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 08:12:24 +00:00
Keep each drawn icon's expiry in a shared icon book, for replanning
render/motion/iconBook holds the icon items a layer drew to a draw set, as
the vessels' book did, and now also when each one's motion stops being what
the layer would plan: put(item, {expiresAt}) records it (Infinity: planned,
never due; null drops it; a restyle keeps it), and due(t) lists the ones to
plan afresh. It reads a moving icon's position and course at a time through
the shared evaluator, as the renderer draws it given its capabilities. An
item easing its course by courseBlendMs reads its target course.
This is what a layer with dead-reckoned contacts keeps on the CPU in place
of the GPU set's own row expiry. The vessels' icon book is now this one.
This commit is contained in:
1 parent
0349941b71
commit
e72382b1aa
4 files changed
+255
-51
No files matched your search
@@ -0,0 +1,128 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
import { fromDegrees } from '../../geo/ellipsoid.js';
|
||||
import { createIconBook } from './iconBook.js';
|
||||
import { iconCourse, iconPosition } from './iconMotion.js';
|
||||
|
||||
const A = fromDegrees(4.1, 51.95, 10);
|
||||
const B = { x: A.x + 1000, y: A.y, z: A.z };
|
||||
const T0 = Date.UTC(2026, 10, 7);
|
||||
const mover = (extra = {}) => ({
|
||||
id: 'a',
|
||||
pos: A,
|
||||
image: 'a.png',
|
||||
size: [16, 16],
|
||||
motion: { kind: 'lerp', from: A, to: B, t0: T0, t1: T0 + 10_000 },
|
||||
courseGlide: { fromCourseDeg: 0, t0: T0, rateDps: 10 },
|
||||
...extra,
|
||||
});
|
||||
|
||||
/** A draw set that records what it is sent. */
|
||||
function recordingSet() {
|
||||
const calls = [];
|
||||
return {
|
||||
calls,
|
||||
id: 'set:1',
|
||||
show: true,
|
||||
upsert: (items) => calls.push(['upsert', items.map((i) => i.id)]),
|
||||
remove: (ids) => calls.push(['remove', ids]),
|
||||
dispose: () => calls.push(['dispose']),
|
||||
};
|
||||
}
|
||||
|
||||
test('the book draws what it is given and reads it back as drawn', () => {
|
||||
const set = recordingSet();
|
||||
const book = createIconBook(set);
|
||||
const item = mover();
|
||||
book.put(item);
|
||||
assert.deepEqual(set.calls, [['upsert', ['a']]]);
|
||||
assert.equal(book.setId, 'set:1');
|
||||
assert.equal(book.item('a'), item);
|
||||
assert.deepEqual(
|
||||
book.position('a', T0 + 5000),
|
||||
iconPosition(item, T0 + 5000),
|
||||
);
|
||||
assert.equal(book.course('a', T0 + 3000), iconCourse(item, T0 + 3000));
|
||||
assert.equal(book.position('nobody', T0), null);
|
||||
assert.equal(book.course('nobody', T0), null);
|
||||
book.remove('a');
|
||||
book.remove('a');
|
||||
assert.deepEqual(set.calls.at(-1), ['remove', ['a']]);
|
||||
assert.equal(set.calls.length, 2, 'removed once');
|
||||
book.dispose();
|
||||
assert.deepEqual(set.calls.at(-1), ['dispose']);
|
||||
});
|
||||
|
||||
test('an item put with an expiry comes due when its motion runs out', () => {
|
||||
const book = createIconBook();
|
||||
book.put(mover(), { expiresAt: T0 + 10_000 });
|
||||
book.put(mover({ id: 'b' }));
|
||||
assert.deepEqual(book.due(T0 + 9999), []);
|
||||
assert.deepEqual(book.due(T0 + 10_000), ['a']);
|
||||
assert.equal(book.expiresAt('a'), T0 + 10_000);
|
||||
assert.equal(book.expiresAt('b'), undefined, 'never due');
|
||||
// A focus change keeps the expiry; replanning sets a new one.
|
||||
book.setFocus('a', 0.5);
|
||||
assert.equal(book.expiresAt('a'), T0 + 10_000);
|
||||
book.put(mover(), { expiresAt: T0 + 20_000 });
|
||||
assert.deepEqual(book.due(T0 + 10_000), []);
|
||||
book.put(mover({ alpha: 0.5 }));
|
||||
assert.equal(book.expiresAt('a'), T0 + 20_000, 'a restyle keeps it');
|
||||
book.put(mover(), { expiresAt: Infinity });
|
||||
assert.deepEqual(book.due(Number.MAX_VALUE), [], 'planned, never due');
|
||||
book.put(mover(), { expiresAt: null });
|
||||
assert.equal(book.expiresAt('a'), undefined, 'null drops it');
|
||||
assert.throws(() => book.put(mover(), { expiresAt: NaN }), TypeError);
|
||||
assert.throws(() => book.put(mover(), { expiresAt: '5' }), TypeError);
|
||||
book.put(mover(), { expiresAt: T0 });
|
||||
book.remove('a');
|
||||
assert.deepEqual(book.due(Infinity), [], 'gone with its item');
|
||||
});
|
||||
|
||||
test('without the renderer’s motion capabilities, icons read where they are drawn', () => {
|
||||
const still = createIconBook(null, { capabilities: new Set() });
|
||||
still.put(mover({ course: 45 }));
|
||||
assert.deepEqual(still.position('a', T0 + 5000), A);
|
||||
assert.equal(still.course('a', T0 + 5000), 45);
|
||||
const noGlide = createIconBook(null, {
|
||||
capabilities: new Set(['motionSegments']),
|
||||
});
|
||||
noGlide.put(mover({ motion: { kind: 'hold', courseDeg: 90 } }));
|
||||
assert.equal(noGlide.course('a', T0 + 1000), 90, 'on course at once');
|
||||
// Glides but does not move: the glide eases onto the item's own course.
|
||||
const noMotion = createIconBook(null, {
|
||||
capabilities: new Set(['courseGlide']),
|
||||
});
|
||||
noMotion.put(mover({ course: 60 }));
|
||||
assert.deepEqual(noMotion.position('a', T0 + 5000), A);
|
||||
assert.equal(noMotion.course('a', T0 + 3000), 30, 'gliding onto 60');
|
||||
assert.equal(noMotion.course('a', T0 + 9000), 60);
|
||||
});
|
||||
|
||||
test('focus is read and written per icon', () => {
|
||||
const book = createIconBook();
|
||||
book.put(mover());
|
||||
assert.equal(book.focus('a'), 1);
|
||||
book.setFocus('a', 0.25);
|
||||
assert.equal(book.focus('a'), 0.25);
|
||||
assert.equal(book.item('a').focus, 0.25);
|
||||
book.setFocus('nobody', 0.5);
|
||||
assert.equal(book.has('nobody'), false);
|
||||
assert.equal(book.expiresAt('a'), undefined, 'focus leaves it unplanned');
|
||||
});
|
||||
|
||||
test('the book shows and hides its draw set, and keeps the order icons came in', () => {
|
||||
const set = recordingSet();
|
||||
const book = createIconBook(set);
|
||||
book.show = false;
|
||||
assert.equal(set.show, false);
|
||||
assert.equal(book.show, false);
|
||||
const alone = createIconBook();
|
||||
alone.show = false;
|
||||
assert.equal(alone.show, true, 'nothing to hide');
|
||||
book.put(mover({ id: 'x' }));
|
||||
book.put(mover({ id: 'y' }));
|
||||
book.put(mover({ id: 'x', alpha: 0.2 }));
|
||||
assert.deepEqual(book.ids(), ['x', 'y']);
|
||||
assert.equal(book.size, 2);
|
||||
});
|
||||
Reference in new issue
Block a user