mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 16:22:20 +00:00
feat(globe): picks on input payloads
input.on('click'|'doubleClick'|'move', fn, { pick, drill }) delivers
{ …event, picked, drilled }: PickResult { id, owner, instance, primitive
(Cesium) } names the mover set (and instance) or line hit. One pick (and
one drill, as deep as the deepest listener) per event, shared by its
listeners; moves with picks are coalesced to one delivery per frame with
the latest position (src/globe/pickDelivery.js). Option checks in the
contract (normalizeInputOptions).
- Cesium: scene.pick / drillPick, and the picker names the owner: movers
map billboards, points and models to their set and instance, lines
their primitives to the line.
- Navara: a click with pick takes Navara's GPU pick of the same gesture
(featureClick; its pick helper answers on the same pointerup, usually
before the engine's click, so a fresh answer waits for it; otherwise
the click waits up to 250 ms, then the CPU pick). Navara 0.2.1 answers
clicks in quick succession with the first click's pick: a GPU answer
whose instance is not drawn near the click is stale and the CPU pick
answers. Hover, drill and the synchronous picker.pick/drillPick are CPU
picks (src/globe/cpuPicks.js) of pickable mover sets and pickable lines
(within half the width + 3 px), behind the globe excluded, nearest
first; lines are picked on the CPU after an empty GPU answer.
picker.clickStats() (Navara only) counts the answers and latencies.
- The fake engine picks its own movers and lines on the CPU unless
scripted.
- The contract suite clicks with real pointer events (puppeteer) on both
engines: a sprite is picked with its owner and instance, the map picks
nothing, two sprites in one place drill both, a line is picked, a
hover picks the sprite under it. Navara, 20 clicks: payload p50 2.8 ms,
p95 4.1 ms after the click (puppeteer dispatch included), 20/20 GPU
answers. The Cesium harness keeps the first-run card closed.
This commit is contained in:
1 parent
86aa0bc9ba
commit
b0cb8ce881
26 files changed
+1267
-68
No files matched your search
+31
-12
@@ -8,7 +8,8 @@
|
||||
// Navara 0.2.1 lets a flyTo run on under user input, where Cesium cancels it;
|
||||
// `onCameraInput` reports user camera input so the engine can do the same.
|
||||
|
||||
import { INPUT_TYPES, MODIFIERS } from '../contract.js';
|
||||
import { INPUT_TYPES, normalizeInputOptions } from '../contract.js';
|
||||
import { createPickDelivery } from '../pickDelivery.js';
|
||||
|
||||
const CLICK_PIXEL_TOLERANCE = 5; // Cesium's _clickPixelTolerance
|
||||
const SCREEN_EVENTS = ['pointerdown', 'pointerup', 'pointermove', 'dblclick'];
|
||||
@@ -23,10 +24,21 @@ function modifierOf(event) {
|
||||
|
||||
/**
|
||||
* @param {{ canvas: HTMLCanvasElement, camera: { options: object } }} view
|
||||
* @param {{ onCameraInput?: (type: string) => void }} [options]
|
||||
* @param {{ onCameraInput?: (type: string) => void,
|
||||
* picker?: { clickPick: Function, pick: Function, drillPick: Function },
|
||||
* scheduleFrame?: (run: () => void) => void }} [options] `picker`
|
||||
* answers listeners with { pick, drill } (picking.js): clicks from the
|
||||
* GPU pick of the gesture, moves from the CPU pick once a frame.
|
||||
* @returns {{ input: object, destroy: () => void }}
|
||||
*/
|
||||
export function createNavaraInput(view, { onCameraInput = () => {} } = {}) {
|
||||
export function createNavaraInput(
|
||||
view,
|
||||
{
|
||||
onCameraInput = () => {},
|
||||
picker = null,
|
||||
scheduleFrame = (run) => requestAnimationFrame(run),
|
||||
} = {},
|
||||
) {
|
||||
const { canvas } = view;
|
||||
const listeners = new Map(INPUT_TYPES.map((type) => [type, new Set()]));
|
||||
let attached = false;
|
||||
@@ -36,15 +48,25 @@ export function createNavaraInput(view, { onCameraInput = () => {} } = {}) {
|
||||
let downAt = null;
|
||||
let last = null;
|
||||
|
||||
const delivery = createPickDelivery({
|
||||
pick: (position, type) =>
|
||||
type === 'move' ? picker?.pick(position) : picker?.clickPick(position),
|
||||
drill: (position, limit) => picker?.drillPick(position, limit) ?? [],
|
||||
schedule: (run) => scheduleFrame(() => !destroyed && run()),
|
||||
});
|
||||
const positionOf = (event) => {
|
||||
const rect = canvas.getBoundingClientRect();
|
||||
return { x: event.clientX - rect.left, y: event.clientY - rect.top };
|
||||
};
|
||||
const emit = (type, event, payload) => {
|
||||
const modifier = modifierOf(event);
|
||||
for (const entry of [...listeners.get(type)])
|
||||
if (entry.modifier === modifier && listeners.get(type).has(entry))
|
||||
entry.listener(payload);
|
||||
const group = listeners.get(type);
|
||||
delivery.deliver(
|
||||
type,
|
||||
payload,
|
||||
[...group].filter((entry) => entry.modifier === modifier),
|
||||
{ isLive: (entry) => group.has(entry) },
|
||||
);
|
||||
};
|
||||
|
||||
const onScreenEvent = (event) => {
|
||||
@@ -90,18 +112,15 @@ export function createNavaraInput(view, { onCameraInput = () => {} } = {}) {
|
||||
});
|
||||
|
||||
const input = {
|
||||
on(type, listener, { modifier } = {}) {
|
||||
if (!INPUT_TYPES.includes(type))
|
||||
throw new TypeError(`Unknown input type: ${type}`);
|
||||
if (modifier !== undefined && !MODIFIERS.includes(modifier))
|
||||
throw new TypeError(`Unknown input modifier: ${modifier}`);
|
||||
on(type, listener, options = {}) {
|
||||
const { modifier, pick, drill } = normalizeInputOptions(type, options);
|
||||
if (destroyed) return () => {};
|
||||
if (!attached) {
|
||||
attached = true;
|
||||
for (const name of SCREEN_EVENTS)
|
||||
canvas.addEventListener(name, onScreenEvent);
|
||||
}
|
||||
const entry = { listener, modifier };
|
||||
const entry = { listener, modifier, pick, drill };
|
||||
listeners.get(type).add(entry);
|
||||
return () => {
|
||||
listeners.get(type).delete(entry);
|
||||
|
||||
Reference in new issue
Block a user